patch-2.1.132 linux/fs/coda/upcall.c
Next file: linux/fs/dcache.c
Previous file: linux/fs/coda/sysctl.c
Back to the patch index
Back to the overall index
- Lines: 755
- Date:
Fri Dec 18 12:45:00 1998
- Orig file:
v2.1.131/linux/fs/coda/upcall.c
- Orig date:
Sat Sep 5 16:46:41 1998
diff -u --recursive --new-file v2.1.131/linux/fs/coda/upcall.c linux/fs/coda/upcall.c
@@ -63,8 +63,8 @@
return b;
}
-#define INSIZE(tag) sizeof(struct cfs_ ## tag ## _in)
-#define OUTSIZE(tag) sizeof(struct cfs_ ## tag ## _out)
+#define INSIZE(tag) sizeof(struct coda_ ## tag ## _in)
+#define OUTSIZE(tag) sizeof(struct coda_ ## tag ## _out)
#define SIZE(tag) max(INSIZE(tag), OUTSIZE(tag))
@@ -77,14 +77,14 @@
ENTRY;
insize = SIZE(root);
- UPARG(CFS_ROOT);
+ UPARG(CODA_ROOT);
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (error) {
printk("coda_get_rootfid: error %d\n", error);
} else {
- *fidp = (ViceFid) outp->cfs_root.VFid;
+ *fidp = (ViceFid) outp->coda_root.VFid;
CDEBUG(D_SUPER, "VolumeId: %lx, VnodeId: %lx.\n",
fidp->Volume, fidp->Vnode);
}
@@ -103,13 +103,13 @@
ENTRY;
insize = SIZE(getattr);
- UPARG(CFS_GETATTR);
- inp->cfs_getattr.VFid = *fid;
+ UPARG(CODA_GETATTR);
+ inp->coda_getattr.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if ( !error )
- *attr = outp->cfs_getattr.attr;
+ *attr = outp->coda_getattr.attr;
if (inp)
CODA_FREE(inp, insize);
@@ -125,10 +125,10 @@
int insize, outsize, error;
insize= SIZE(setattr);
- UPARG(CFS_SETATTR);
+ UPARG(CODA_SETATTR);
- inp->cfs_setattr.VFid = *fid;
- inp->cfs_setattr.attr = *vattr;
+ inp->coda_setattr.VFid = *fid;
+ inp->coda_setattr.attr = *vattr;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
@@ -148,10 +148,11 @@
offset = INSIZE(lookup);
insize = max(offset + length +1, OUTSIZE(lookup));
- UPARG(CFS_LOOKUP);
+ UPARG(CODA_LOOKUP);
- inp->cfs_lookup.VFid = *fid;
- inp->cfs_lookup.name = offset;
+ inp->coda_lookup.VFid = *fid;
+ inp->coda_lookup.name = offset;
+ inp->coda_lookup.flags = CLU_CASE_SENSITIVE;
/* send Venus a null terminated string */
memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0';
@@ -159,8 +160,8 @@
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if ( !error ) {
- *resfid = outp->cfs_lookup.VFid;
- *type = outp->cfs_lookup.vtype;
+ *resfid = outp->coda_lookup.VFid;
+ *type = outp->coda_lookup.vtype;
}
if (inp) CODA_FREE(inp, insize);
@@ -168,17 +169,23 @@
}
-int venus_release(struct super_block *sb, struct ViceFid *fid, int flags)
+int venus_release(struct super_block *sb, struct ViceFid *fid, int flags,
+ struct coda_cred *cred)
{
union inputArgs *inp;
union outputArgs *outp;
int insize, outsize, error;
insize = SIZE(close);
- UPARG(CFS_CLOSE);
-
- inp->cfs_close.VFid = *fid;
- inp->cfs_close.flags = flags;
+ UPARG(CODA_CLOSE);
+
+ if ( cred ) {
+ memcpy(&(inp->ih.cred), cred, sizeof(*cred));
+ } else
+ printk("CODA: close without valid file creds.\n");
+
+ inp->coda_close.VFid = *fid;
+ inp->coda_close.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
@@ -195,16 +202,16 @@
int insize, outsize, error;
insize = SIZE(open);
- UPARG(CFS_OPEN);
+ UPARG(CODA_OPEN);
- inp->cfs_open.VFid = *fid;
- inp->cfs_open.flags = flags;
+ inp->coda_open.VFid = *fid;
+ inp->coda_open.flags = flags;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if ( !error ) {
- *ino = outp->cfs_open.inode;
- *dev = outp->cfs_open.dev;
+ *ino = outp->coda_open.inode;
+ *dev = outp->coda_open.dev;
} else {
*ino = 0;
*dev = 0;
@@ -227,19 +234,19 @@
offset = INSIZE(mkdir);
insize = max(offset + length + 1, OUTSIZE(mkdir));
- UPARG(CFS_MKDIR);
+ UPARG(CODA_MKDIR);
- inp->cfs_mkdir.VFid = *dirfid;
- inp->cfs_mkdir.attr = *attrs;
- inp->cfs_mkdir.name = offset;
+ inp->coda_mkdir.VFid = *dirfid;
+ inp->coda_mkdir.attr = *attrs;
+ inp->coda_mkdir.name = offset;
/* Venus must get null terminated string */
memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
- *attrs = outp->cfs_mkdir.attr;
- *newfid = outp->cfs_mkdir.VFid;
+ *attrs = outp->coda_mkdir.attr;
+ *newfid = outp->coda_mkdir.VFid;
if (inp)
CODA_FREE(inp, insize);
@@ -260,11 +267,11 @@
offset = INSIZE(rename);
insize = max(offset + new_length + old_length + 8,
OUTSIZE(rename));
- UPARG(CFS_RENAME);
+ UPARG(CODA_RENAME);
- inp->cfs_rename.sourceFid = *old_fid;
- inp->cfs_rename.destFid = *new_fid;
- inp->cfs_rename.srcname = offset;
+ inp->coda_rename.sourceFid = *old_fid;
+ inp->coda_rename.destFid = *new_fid;
+ inp->coda_rename.srcname = offset;
/* Venus must receive an null terminated string */
s = ( old_length & ~0x3) +4; /* round up to word boundary */
@@ -273,13 +280,13 @@
/* another null terminated string for Venus */
offset += s;
- inp->cfs_rename.destname = offset;
+ inp->coda_rename.destname = offset;
s = ( new_length & ~0x3) +4; /* round up to word boundary */
memcpy((char *)(inp) + offset, new_name, new_length);
*((char *)inp + offset + new_length) = '\0';
CDEBUG(D_INODE, "destname in packet: %s\n",
- (char *)inp + (int) inp->cfs_rename.destname);
+ (char *)inp + (int) inp->coda_rename.destname);
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (inp) CODA_FREE(inp, insize);
@@ -297,14 +304,14 @@
offset = INSIZE(create);
insize = max(offset + length + 1, OUTSIZE(create));
- UPARG(CFS_CREATE);
+ UPARG(CODA_CREATE);
- inp->cfs_create.VFid = *dirfid;
- inp->cfs_create.attr.va_mode = mode;
- inp->cfs_create.attr.va_rdev = rdev;
- inp->cfs_create.excl = excl;
- inp->cfs_create.mode = mode;
- inp->cfs_create.name = offset;
+ inp->coda_create.VFid = *dirfid;
+ inp->coda_create.attr.va_mode = mode;
+ inp->coda_create.attr.va_rdev = rdev;
+ inp->coda_create.excl = excl;
+ inp->coda_create.mode = mode;
+ inp->coda_create.name = offset;
/* Venus must get null terminated string */
memcpy((char *)(inp) + offset, name, length);
@@ -312,8 +319,8 @@
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
- *attrs = outp->cfs_create.attr;
- *newfid = outp->cfs_create.VFid;
+ *attrs = outp->coda_create.attr;
+ *newfid = outp->coda_create.VFid;
if (inp)
CODA_FREE(inp, insize);
@@ -330,10 +337,10 @@
offset = INSIZE(rmdir);
insize = max(offset + length + 1, OUTSIZE(rmdir));
- UPARG(CFS_RMDIR);
+ UPARG(CODA_RMDIR);
- inp->cfs_rmdir.VFid = *dirfid;
- inp->cfs_rmdir.name = offset;
+ inp->coda_rmdir.VFid = *dirfid;
+ inp->coda_rmdir.name = offset;
memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0';
@@ -352,10 +359,10 @@
offset = INSIZE(remove);
insize = max(offset + length + 1, OUTSIZE(remove));
- UPARG(CFS_REMOVE);
+ UPARG(CODA_REMOVE);
- inp->cfs_remove.VFid = *dirfid;
- inp->cfs_remove.name = offset;
+ inp->coda_remove.VFid = *dirfid;
+ inp->coda_remove.name = offset;
memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0';
@@ -375,18 +382,18 @@
char *result;
insize = max(INSIZE(readlink), OUTSIZE(readlink)+ *length + 1);
- UPARG(CFS_READLINK);
+ UPARG(CODA_READLINK);
- inp->cfs_readlink.VFid = *fid;
+ inp->coda_readlink.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (! error) {
- retlen = outp->cfs_readlink.count;
+ retlen = outp->coda_readlink.count;
if ( retlen > *length )
retlen = *length;
*length = retlen;
- result = (char *)outp + (int)outp->cfs_readlink.data;
+ result = (char *)outp + (int)outp->coda_readlink.data;
memcpy(buffer, result, retlen);
*(buffer + retlen) = '\0';
}
@@ -409,11 +416,11 @@
offset = INSIZE(link);
insize = max(offset + len + 1, OUTSIZE(link));
- UPARG(CFS_LINK);
+ UPARG(CODA_LINK);
- inp->cfs_link.sourceFid = *fid;
- inp->cfs_link.destFid = *dirfid;
- inp->cfs_link.tname = offset;
+ inp->coda_link.sourceFid = *fid;
+ inp->coda_link.destFid = *dirfid;
+ inp->coda_link.tname = offset;
/* make sure strings are null terminated */
memcpy((char *)(inp) + offset, name, len);
@@ -439,20 +446,20 @@
offset = INSIZE(symlink);
insize = max(offset + len + symlen + 8, OUTSIZE(symlink));
- UPARG(CFS_SYMLINK);
+ UPARG(CODA_SYMLINK);
- /* inp->cfs_symlink.attr = *tva; XXXXXX */
- inp->cfs_symlink.VFid = *fid;
+ /* inp->coda_symlink.attr = *tva; XXXXXX */
+ inp->coda_symlink.VFid = *fid;
/* Round up to word boundary and null terminate */
- inp->cfs_symlink.srcname = offset;
+ inp->coda_symlink.srcname = offset;
s = ( symlen & ~0x3 ) + 4;
memcpy((char *)(inp) + offset, symname, symlen);
*((char *)inp + offset + symlen) = '\0';
/* Round up to word boundary and null terminate */
offset += s;
- inp->cfs_symlink.tname = offset;
+ inp->coda_symlink.tname = offset;
s = (len & ~0x3) + 4;
memcpy((char *)(inp) + offset, name, len);
*((char *)inp + offset + len) = '\0';
@@ -473,9 +480,9 @@
int insize, outsize, error;
insize=SIZE(fsync);
- UPARG(CFS_FSYNC);
+ UPARG(CODA_FSYNC);
- inp->cfs_fsync.VFid = *fid;
+ inp->coda_fsync.VFid = *fid;
error = coda_upcall(coda_sbp(sb), sizeof(union inputArgs),
&outsize, inp);
@@ -491,10 +498,10 @@
int insize, outsize, error;
insize = SIZE(access);
- UPARG(CFS_ACCESS);
+ UPARG(CODA_ACCESS);
- inp->cfs_access.VFid = *fid;
- inp->cfs_access.flags = mask;
+ inp->coda_access.VFid = *fid;
+ inp->coda_access.flags = mask;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
@@ -513,7 +520,7 @@
int iocsize;
insize = VC_MAXMSGSIZE;
- UPARG(CFS_IOCTL);
+ UPARG(CODA_IOCTL);
/* build packet for Venus */
if (data->vi.in_size > VC_MAXDATASIZE) {
@@ -521,21 +528,21 @@
goto exit;
}
- inp->cfs_ioctl.VFid = *fid;
+ inp->coda_ioctl.VFid = *fid;
/* the cmd field was mutated by increasing its size field to
* reflect the path and follow args. We need to subtract that
* out before sending the command to Venus. */
- inp->cfs_ioctl.cmd = (cmd & ~(PIOCPARM_MASK << 16));
+ inp->coda_ioctl.cmd = (cmd & ~(PIOCPARM_MASK << 16));
iocsize = ((cmd >> 16) & PIOCPARM_MASK) - sizeof(char *) - sizeof(int);
- inp->cfs_ioctl.cmd |= (iocsize & PIOCPARM_MASK) << 16;
+ inp->coda_ioctl.cmd |= (iocsize & PIOCPARM_MASK) << 16;
- /* in->cfs_ioctl.rwflag = flag; */
- inp->cfs_ioctl.len = data->vi.in_size;
- inp->cfs_ioctl.data = (char *)(INSIZE(ioctl));
+ /* in->coda_ioctl.rwflag = flag; */
+ inp->coda_ioctl.len = data->vi.in_size;
+ inp->coda_ioctl.data = (char *)(INSIZE(ioctl));
/* get the data out of user space */
- if ( copy_from_user((char*)inp + (int)inp->cfs_ioctl.data,
+ if ( copy_from_user((char*)inp + (int)inp->coda_ioctl.data,
data->vi.in, data->vi.in_size) ) {
error = EINVAL;
goto exit;
@@ -550,9 +557,9 @@
}
/* Copy out the OUT buffer. */
- if (outp->cfs_ioctl.len > data->vi.out_size) {
+ if (outp->coda_ioctl.len > data->vi.out_size) {
CDEBUG(D_FILE, "return len %d <= request len %d\n",
- outp->cfs_ioctl.len,
+ outp->coda_ioctl.len,
data->vi.out_size);
error = EINVAL;
} else {
@@ -561,7 +568,7 @@
if ( error ) goto exit;
if (copy_to_user(data->vi.out,
- (char *)outp + (int)outp->cfs_ioctl.data,
+ (char *)outp + (int)outp->coda_ioctl.data,
data->vi.out_size)) {
error = EINVAL;
goto exit;
@@ -579,15 +586,15 @@
*
*/
-static inline unsigned long coda_waitfor_upcall(struct vmsg *vmp)
+static inline unsigned long coda_waitfor_upcall(struct upc_req *vmp)
{
struct wait_queue wait = { current, NULL };
unsigned long posttime;
- vmp->vm_posttime = jiffies;
+ vmp->uc_posttime = jiffies;
posttime = jiffies;
- add_wait_queue(&vmp->vm_sleep, &wait);
+ add_wait_queue(&vmp->uc_sleep, &wait);
for (;;) {
if ( coda_hard == 0 )
current->state = TASK_INTERRUPTIBLE;
@@ -595,7 +602,7 @@
current->state = TASK_UNINTERRUPTIBLE;
/* got a reply */
- if ( vmp->vm_flags & VM_WRITE )
+ if ( vmp->uc_flags & REQ_WRITE )
break;
if ( !coda_hard && signal_pending(current) ) {
@@ -605,13 +612,13 @@
break;
/* signal is present: after timeout always return
really smart idea, probably useless ... */
- if ( jiffies > vmp->vm_posttime + coda_timeout * HZ )
+ if ( jiffies - vmp->uc_posttime > coda_timeout * HZ )
break;
}
schedule();
}
- remove_wait_queue(&vmp->vm_sleep, &wait);
+ remove_wait_queue(&vmp->uc_sleep, &wait);
current->state = TASK_RUNNING;
CDEBUG(D_SPECIAL, "posttime: %ld, returned: %ld\n", posttime, jiffies-posttime);
@@ -635,40 +642,37 @@
union inputArgs *buffer)
{
unsigned long runtime;
- struct vcomm *vcommp;
+ struct venus_comm *vcommp;
union outputArgs *out;
- struct vmsg *vmp;
+ struct upc_req *req;
int error = 0;
ENTRY;
- if (sbi->sbi_vcomm == NULL) {
- return -ENODEV;
- }
- vcommp = sbi->sbi_vcomm;
-
-
- if (!vcomm_open(vcommp))
+ vcommp = &coda_upc_comm;
+ if ( !vcommp->vc_pid ) {
+ printk("No pseudo device in upcall comms at %p\n", vcommp);
return -ENXIO;
+ }
/* Format the request message. */
- CODA_ALLOC(vmp,struct vmsg *,sizeof(struct vmsg));
- vmp->vm_data = (void *)buffer;
- vmp->vm_flags = 0;
- vmp->vm_inSize = inSize;
- vmp->vm_outSize = *outSize ? *outSize : inSize;
- vmp->vm_opcode = ((union inputArgs *)buffer)->ih.opcode;
- vmp->vm_unique = ++vcommp->vc_seq;
- vmp->vm_sleep = NULL;
+ CODA_ALLOC(req,struct upc_req *,sizeof(struct upc_req));
+ req->uc_data = (void *)buffer;
+ req->uc_flags = 0;
+ req->uc_inSize = inSize;
+ req->uc_outSize = *outSize ? *outSize : inSize;
+ req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode;
+ req->uc_unique = ++vcommp->vc_seq;
+ req->uc_sleep = NULL;
/* Fill in the common input args. */
- ((union inputArgs *)buffer)->ih.unique = vmp->vm_unique;
+ ((union inputArgs *)buffer)->ih.unique = req->uc_unique;
/* Append msg to pending queue and poke Venus. */
- coda_q_insert(&(vmp->vm_chain), &(vcommp->vc_pending));
+ list_add(&(req->uc_chain), vcommp->vc_pending.prev);
CDEBUG(D_UPCALL,
"Proc %d wake Venus for(opc,uniq) =(%d,%d) msg at %x.zzz.\n",
- current->pid, vmp->vm_opcode, vmp->vm_unique, (int)vmp);
+ current->pid, req->uc_opcode, req->uc_unique, (int)req);
wake_up_interruptible(&vcommp->vc_waitq);
/* We can be interrupted while we wait for Venus to process
@@ -681,19 +685,19 @@
* ENODEV. */
/* Go to sleep. Wake up on signals only after the timeout. */
- runtime = coda_waitfor_upcall(vmp);
+ runtime = coda_waitfor_upcall(req);
coda_upcall_stats(((union inputArgs *)buffer)->ih.opcode, runtime);
CDEBUG(D_TIMING, "opc: %d time: %ld uniq: %d size: %d\n",
- vmp->vm_opcode, jiffies - vmp->vm_posttime,
- vmp->vm_unique, vmp->vm_outSize);
+ req->uc_opcode, jiffies - req->uc_posttime,
+ req->uc_unique, req->uc_outSize);
CDEBUG(D_UPCALL,
- "..process %d woken up by Venus for vmp at 0x%x, data at %x\n",
- current->pid, (int)vmp, (int)vmp->vm_data);
- if (vcomm_open(vcommp)) { /* i.e. Venus is still alive */
+ "..process %d woken up by Venus for req at 0x%x, data at %x\n",
+ current->pid, (int)req, (int)req->uc_data);
+ if (vcommp->vc_pid) { /* i.e. Venus is still alive */
/* Op went through, interrupt or not... */
- if (vmp->vm_flags & VM_WRITE) {
- out = (union outputArgs *)vmp->vm_data;
+ if (req->uc_flags & REQ_WRITE) {
+ out = (union outputArgs *)req->uc_data;
/* here we map positive Venus errors to kernel errors */
if ( out->oh.result < 0 ) {
printk("Tell Peter: Venus returns negative error %ld, for oc %ld!\n",
@@ -704,49 +708,49 @@
CDEBUG(D_UPCALL,
"upcall: (u,o,r) (%ld, %ld, %ld) out at %p\n",
out->oh.unique, out->oh.opcode, out->oh.result, out);
- *outSize = vmp->vm_outSize;
+ *outSize = req->uc_outSize;
goto exit;
}
- if ( !(vmp->vm_flags & VM_READ) && signal_pending(current)) {
+ if ( !(req->uc_flags & REQ_READ) && signal_pending(current)) {
/* Interrupted before venus read it. */
CDEBUG(D_UPCALL,
"Interrupted before read:(op,un) (%d.%d), flags = %x\n",
- vmp->vm_opcode, vmp->vm_unique, vmp->vm_flags);
- coda_q_remove(&(vmp->vm_chain));
+ req->uc_opcode, req->uc_unique, req->uc_flags);
+ list_del(&(req->uc_chain));
/* perhaps the best way to convince the app to
give up? */
error = -EINTR;
goto exit;
}
- if ( (vmp->vm_flags & VM_READ) && signal_pending(current) ) {
+ if ( (req->uc_flags & REQ_READ) && signal_pending(current) ) {
/* interrupted after Venus did its read, send signal */
- union inputArgs *dog;
- struct vmsg *svmp;
+ union inputArgs *sig_inputArgs;
+ struct upc_req *sig_req;
CDEBUG(D_UPCALL,
"Sending Venus a signal: op = %d.%d, flags = %x\n",
- vmp->vm_opcode, vmp->vm_unique, vmp->vm_flags);
+ req->uc_opcode, req->uc_unique, req->uc_flags);
- coda_q_remove(&(vmp->vm_chain));
+ list_del(&(req->uc_chain));
error = -EINTR;
- CODA_ALLOC(svmp, struct vmsg *, sizeof (struct vmsg));
- CODA_ALLOC((svmp->vm_data), char *, sizeof(struct cfs_in_hdr));
+ CODA_ALLOC(sig_req, struct upc_req *, sizeof (struct upc_req));
+ CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr));
- dog = (union inputArgs *)svmp->vm_data;
- dog->ih.opcode = CFS_SIGNAL;
- dog->ih.unique = vmp->vm_unique;
+ sig_inputArgs = (union inputArgs *)sig_req->uc_data;
+ sig_inputArgs->ih.opcode = CODA_SIGNAL;
+ sig_inputArgs->ih.unique = req->uc_unique;
- svmp->vm_flags = 0;
- svmp->vm_opcode = dog->ih.opcode;
- svmp->vm_unique = dog->ih.unique;
- svmp->vm_inSize = sizeof(struct cfs_in_hdr);
- svmp->vm_outSize = sizeof(struct cfs_in_hdr);
+ sig_req->uc_flags = REQ_ASYNC;
+ sig_req->uc_opcode = sig_inputArgs->ih.opcode;
+ sig_req->uc_unique = sig_inputArgs->ih.unique;
+ sig_req->uc_inSize = sizeof(struct coda_in_hdr);
+ sig_req->uc_outSize = sizeof(struct coda_in_hdr);
CDEBUG(D_UPCALL,
"coda_upcall: enqueing signal msg (%d, %d)\n",
- svmp->vm_opcode, svmp->vm_unique);
+ sig_req->uc_opcode, sig_req->uc_unique);
/* insert at head of queue! */
- coda_q_insert(&(svmp->vm_chain), vcommp->vc_pending.forw);
+ list_add(&(sig_req->uc_chain), &vcommp->vc_pending);
wake_up_interruptible(&vcommp->vc_waitq);
} else {
printk("Coda: Strange interruption..\n");
@@ -754,12 +758,12 @@
}
} else { /* If venus died i.e. !VC_OPEN(vcommp) */
printk("coda_upcall: Venus dead on (op,un) (%d.%d) flags %d\n",
- vmp->vm_opcode, vmp->vm_unique, vmp->vm_flags);
+ req->uc_opcode, req->uc_unique, req->uc_flags);
error = -ENODEV;
}
exit:
- CODA_FREE(vmp, sizeof(struct vmsg));
+ CODA_FREE(req, sizeof(struct upc_req));
if (error)
badclstats();
return error;
@@ -778,26 +782,26 @@
* There are 7 cases where cache invalidations occur. The semantics
* of each is listed here:
*
- * CFS_FLUSH -- flush all entries from the name cache and the cnode cache.
- * CFS_PURGEUSER -- flush all entries from the name cache for a specific user
+ * CODA_FLUSH -- flush all entries from the name cache and the cnode cache.
+ * CODA_PURGEUSER -- flush all entries from the name cache for a specific user
* This call is a result of token expiration.
*
* The next arise as the result of callbacks on a file or directory.
- * CFS_ZAPFILE -- flush the cached attributes for a file.
+ * CODA_ZAPFILE -- flush the cached attributes for a file.
- * CFS_ZAPDIR -- flush the attributes for the dir and
+ * CODA_ZAPDIR -- flush the attributes for the dir and
* force a new lookup for all the children
of this dir.
*
* The next is a result of Venus detecting an inconsistent file.
- * CFS_PURGEFID -- flush the attribute for the file
+ * CODA_PURGEFID -- flush the attribute for the file
* purge it and its children from the dcache
*
* The last allows Venus to replace local fids with global ones
* during reintegration.
*
- * CFS_REPLACE -- replace one ViceFid with another throughout the name cache */
+ * CODA_REPLACE -- replace one ViceFid with another throughout the name cache */
int coda_downcall(int opcode, union outputArgs * out, struct super_block *sb)
{
@@ -810,37 +814,38 @@
switch (opcode) {
- case CFS_FLUSH : {
- clstats(CFS_FLUSH);
- CDEBUG(D_DOWNCALL, "CFS_FLUSH\n");
+ case CODA_FLUSH : {
+ clstats(CODA_FLUSH);
+ CDEBUG(D_DOWNCALL, "CODA_FLUSH\n");
coda_cache_clear_all(sb);
shrink_dcache_sb(sb);
+ coda_flag_inode(sb->s_root->d_inode, C_FLUSH);
return(0);
}
- case CFS_PURGEUSER : {
- struct coda_cred *cred = &out->cfs_purgeuser.cred;
- CDEBUG(D_DOWNCALL, "CFS_PURGEUSER\n");
+ case CODA_PURGEUSER : {
+ struct coda_cred *cred = &out->coda_purgeuser.cred;
+ CDEBUG(D_DOWNCALL, "CODA_PURGEUSER\n");
if ( !cred ) {
printk("PURGEUSER: null cred!\n");
return 0;
}
- clstats(CFS_PURGEUSER);
+ clstats(CODA_PURGEUSER);
coda_cache_clear_cred(sb, cred);
return(0);
}
- case CFS_ZAPDIR : {
+ case CODA_ZAPDIR : {
struct inode *inode;
- ViceFid *fid = &out->cfs_zapdir.CodaFid;
+ ViceFid *fid = &out->coda_zapdir.CodaFid;
CDEBUG(D_DOWNCALL, "zapdir: fid = %s...\n", coda_f2s(fid));
- clstats(CFS_ZAPDIR);
+ clstats(CODA_ZAPDIR);
inode = coda_fid_to_inode(fid, sb);
if (inode) {
CDEBUG(D_DOWNCALL, "zapdir: inode = %ld children flagged\n",
inode->i_ino);
- coda_purge_children(inode);
+ coda_flag_inode_children(inode, C_PURGE);
CDEBUG(D_DOWNCALL, "zapdir: inode = %ld cache cleared\n", inode->i_ino);
coda_flag_inode(inode, C_VATTR);
} else
@@ -849,10 +854,10 @@
return(0);
}
- case CFS_ZAPFILE : {
+ case CODA_ZAPFILE : {
struct inode *inode;
- struct ViceFid *fid = &out->cfs_zapfile.CodaFid;
- clstats(CFS_ZAPFILE);
+ struct ViceFid *fid = &out->coda_zapfile.CodaFid;
+ clstats(CODA_ZAPFILE);
CDEBUG(D_DOWNCALL, "zapfile: fid = %s\n", coda_f2s(fid));
inode = coda_fid_to_inode(fid, sb);
if ( inode ) {
@@ -863,27 +868,27 @@
return 0;
}
- case CFS_PURGEFID : {
+ case CODA_PURGEFID : {
struct inode *inode;
- ViceFid *fid = &out->cfs_purgefid.CodaFid;
+ ViceFid *fid = &out->coda_purgefid.CodaFid;
CDEBUG(D_DOWNCALL, "purgefid: fid = %s\n", coda_f2s(fid));
- clstats(CFS_PURGEFID);
+ clstats(CODA_PURGEFID);
inode = coda_fid_to_inode(fid, sb);
if ( inode ) {
CDEBUG(D_DOWNCALL, "purgefid: inode = %ld\n", inode->i_ino);
- coda_purge_children(inode);
+ coda_flag_inode_children(inode, C_PURGE);
coda_purge_dentries(inode);
}else
CDEBUG(D_DOWNCALL, "purgefid: no inode\n");
return 0;
}
- case CFS_REPLACE : {
+ case CODA_REPLACE : {
struct inode *inode;
- ViceFid *oldfid = &out->cfs_replace.OldFid;
- ViceFid *newfid = &out->cfs_replace.NewFid;
- clstats(CFS_REPLACE);
- CDEBUG(D_DOWNCALL, "CFS_REPLACE\n");
+ ViceFid *oldfid = &out->coda_replace.OldFid;
+ ViceFid *newfid = &out->coda_replace.NewFid;
+ clstats(CODA_REPLACE);
+ CDEBUG(D_DOWNCALL, "CODA_REPLACE\n");
inode = coda_fid_to_inode(oldfid, sb);
if ( inode ) {
CDEBUG(D_DOWNCALL, "replacefid: inode = %ld\n", inode->i_ino);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov