diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-25 15:24:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-25 15:24:11 -0700 |
| commit | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (patch) | |
| tree | 42dee61b79734e9465001ad3bbcb7597ff3eb20e | |
| parent | 3e79d97828841305e3369ad1e07cfed5bf5989ef (diff) | |
| parent | 1406b916f4a29d5f9660264a28ce609c8c77e7ae (diff) | |
| download | linux-632b06aa2842b12c6d6a510ec080fb6ebdb38ea5.tar.bz2 | |
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
Pull nfsd fix frm Bruce Fields:
"J R Okajima sent this early and I was just slow to pass it along,
apologies. Fortunately it's a simple fix"
* 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
nfsd: fix lost nfserrno() call in nfsd_setattr()
| -rw-r--r-- | fs/nfsd/vfs.c | 1 |
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) |