diff options
| author | NeilBrown <neilb@suse.de> | 2006-01-18 17:43:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 19:20:28 -0800 |
| commit | 45bd3b3dffaa9fb1706fe001bf66276d0997a850 (patch) | |
| tree | 9b5a8dc7f619cea36b3ad87d0dbd4545e24d0336 /fs/nfsd | |
| parent | 7fcd53303de8dbbed863f6471ca92eb96a1faa28 (diff) | |
| download | linux-3.10-45bd3b3dffaa9fb1706fe001bf66276d0997a850.tar.gz linux-3.10-45bd3b3dffaa9fb1706fe001bf66276d0997a850.tar.bz2 linux-3.10-45bd3b3dffaa9fb1706fe001bf66276d0997a850.zip | |
[PATCH] knfsd: Fix some more errno/nfserr confusion in vfs.c
nfsd_sync* return an errno, which usually needs to be converted to an errno,
sometimes immediately, sometimes a little later.
Also, nfsd_setattr returns an nfserr which SHOULDN'T be converted from
an errno (because it isn't one).
Also some tidyups of the form:
err = XX
err = nfserrno(err)
and
err = XX
if (err)
err = nfserrno(err)
become
err = nfserrno(XX)
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index e6dfa149a30..5320e5afadd 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -891,9 +891,9 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, int err = 0; int stable = *stablep; +#ifdef MSNFS err = nfserr_perm; -#ifdef MSNFS if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) && (!lock_may_write(file->f_dentry->d_inode, offset, cnt))) goto out; @@ -1065,8 +1065,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, return err; if (EX_ISSYNC(fhp->fh_export)) { if (file->f_op && file->f_op->fsync) { - err = nfsd_sync(file); - err = nfserrno(err); + err = nfserrno(nfsd_sync(file)); } else { err = nfserr_notsupp; } @@ -1177,7 +1176,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, goto out_nfserr; if (EX_ISSYNC(fhp->fh_export)) { - err = nfsd_sync_dir(dentry); + err = nfserrno(nfsd_sync_dir(dentry)); write_inode_now(dchild->d_inode, 1); } @@ -1310,9 +1309,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, goto out_nfserr; if (EX_ISSYNC(fhp->fh_export)) { - err = nfsd_sync_dir(dentry); - if (err) - err = nfserrno(err); + err = nfserrno(nfsd_sync_dir(dentry)); /* setattr will sync the child (or not) */ } @@ -1339,7 +1336,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, if ((iap->ia_valid &= ~(ATTR_UID|ATTR_GID)) != 0) { int err2 = nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0); if (err2) - err = nfserrno(err2); + err = err2; } /* @@ -1514,10 +1511,8 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, err = vfs_link(dold, dirp, dnew); if (!err) { if (EX_ISSYNC(ffhp->fh_export)) { - err = nfsd_sync_dir(ddir); + err = nfserrno(nfsd_sync_dir(ddir)); write_inode_now(dest, 1); - if (err) - err = nfserrno(err); } } else { if (err == -EXDEV && rqstp->rq_vers == 2) |