]> git.karo-electronics.de Git - linux-beck.git/commitdiff
nfsd: fix lost nfserrno() call in nfsd_setattr()
authorJ. R. Okajima <hooanon05g@gmail.com>
Tue, 18 Feb 2014 15:27:53 +0000 (00:27 +0900)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 18 Feb 2014 17:25:57 +0000 (12:25 -0500)
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>
fs/nfsd/vfs.c

index 017d3cb5e99b4391027fe37b7c56c23966754e2d..6d7be3f8035631cb207a5733c71dbfc2f800fa4c 100644 (file)
@@ -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)