summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
authorJ. R. Okajima <hooanon05g@gmail.com>2014-02-19 00:27:53 +0900
committerJ. Bruce Fields <bfields@redhat.com>2014-02-18 12:25:57 -0500
commit1406b916f4a29d5f9660264a28ce609c8c77e7ae (patch)
tree13966a3acca4d30f31ddc12e8c9df2f24eb62fb2 /fs/nfsd/vfs.c
parent2ec197db1a56c9269d75e965f14c344b58b2a4f6 (diff)
downloadlinux-1406b916f4a29d5f9660264a28ce609c8c77e7ae.tar.bz2
nfsd: fix lost nfserrno() call in nfsd_setattr()
There is a regression in 208d0ac 2014-01-07 nfsd4: break only delegations when appropriate which deletes an nfserrno() call in nfsd_setattr() (by accident, probably), and NFSD becomes ignoring an error from VFS. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 017d3cb5e99b..6d7be3f80356 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -449,6 +449,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
fh_lock(fhp);
host_err = notify_change(dentry, iap, NULL);
fh_unlock(fhp);
+ err = nfserrno(host_err);
out_put_write_access:
if (size_change)