iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coda: ignore returned values when upcalls return errors

Browse Source 
Venus returns an ENOENT error on open, so we shouldn't try to grab the
filehandle for the returned fd.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Harkes 2007-07-19 01:48:48 -07:00 committed by Linus Torvalds
parent 37461e1957
commit 970648eb03
1 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
fs/coda/upcall.c
View File

@ -84,12 +84,8 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp)
UPARG(CODA_ROOT); UPARG(CODA_ROOT);
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (!error)
if (error) {
printk("coda_get_rootfid: error %d\n", error);
} else {
*fidp = outp->coda_root.VFid; *fidp = outp->coda_root.VFid;
}
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -106,9 +102,9 @@ int venus_getattr(struct super_block *sb, struct CodaFid *fid,
UPARG(CODA_GETATTR); UPARG(CODA_GETATTR);
inp->coda_getattr.VFid = *fid; inp->coda_getattr.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (!error)
*attr = outp->coda_getattr.attr; *attr = outp->coda_getattr.attr;
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -153,10 +149,11 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (!error) {
*resfid = outp->coda_lookup.VFid; *resfid = outp->coda_lookup.VFid;
*type = outp->coda_lookup.vtype; *type = outp->coda_lookup.vtype;
}
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -278,11 +275,12 @@ int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
/* Venus must get null terminated string */ /* Venus must get null terminated string */
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
*attrs = outp->coda_mkdir.attr; error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
*newfid = outp->coda_mkdir.VFid; if (!error) {
*attrs = outp->coda_mkdir.attr;
*newfid = outp->coda_mkdir.VFid;
}
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -348,11 +346,12 @@ int venus_create(struct super_block *sb, struct CodaFid *dirfid,
/* Venus must get null terminated string */ /* Venus must get null terminated string */
memcpy((char *)(inp) + offset, name, length); memcpy((char *)(inp) + offset, name, length);
*((char *)inp + offset + length) = '\0'; *((char *)inp + offset + length) = '\0';
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
*attrs = outp->coda_create.attr; error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
*newfid = outp->coda_create.VFid; if (!error) {
*attrs = outp->coda_create.attr;
*newfid = outp->coda_create.VFid;
}
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
@ -417,19 +416,18 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
UPARG(CODA_READLINK); UPARG(CODA_READLINK);
inp->coda_readlink.VFid = *fid; inp->coda_readlink.VFid = *fid;
error = coda_upcall(coda_sbp(sb), insize, &outsize, inp); error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
if (!error) {
if (! error) { retlen = outp->coda_readlink.count;
retlen = outp->coda_readlink.count;
if ( retlen > *length ) if ( retlen > *length )
retlen = *length; retlen = *length;
*length = retlen; *length = retlen;
result = (char *)outp + (long)outp->coda_readlink.data; result = (char *)outp + (long)outp->coda_readlink.data;
memcpy(buffer, result, retlen); memcpy(buffer, result, retlen);
*(buffer + retlen) = '\0'; *(buffer + retlen) = '\0';
} }
CODA_FREE(inp, insize); CODA_FREE(inp, insize);
return error; return error;
} }
@ -617,16 +615,13 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs)); insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
UPARG(CODA_STATFS); UPARG(CODA_STATFS);
error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp); error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp);
if (!error) {
if (!error) {
sfs->f_blocks = outp->coda_statfs.stat.f_blocks; sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
sfs->f_bfree = outp->coda_statfs.stat.f_bfree; sfs->f_bfree = outp->coda_statfs.stat.f_bfree;
sfs->f_bavail = outp->coda_statfs.stat.f_bavail; sfs->f_bavail = outp->coda_statfs.stat.f_bavail;
sfs->f_files = outp->coda_statfs.stat.f_files; sfs->f_files = outp->coda_statfs.stat.f_files;
sfs->f_ffree = outp->coda_statfs.stat.f_ffree; sfs->f_ffree = outp->coda_statfs.stat.f_ffree;
} else {
printk("coda_statfs: Venus returns: %d\n", error);
} }
CODA_FREE(inp, insize); CODA_FREE(inp, insize);