diff options
| author | J. Bruce Fields | 2014-02-24 20:59:47 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2014-03-27 21:31:48 +0100 |
| commit | 9f67f189939eccaa54f3d2c9cf10788abaf2d584 (patch) | |
| tree | 0464a235035531cc66434d2aca4690ca1a56f8d4 /fs/nfsd/vfs.c | |
| parent | nfsd4: fix test_stateid error reply encoding (diff) | |
| download | kernel-qcow2-linux-9f67f189939eccaa54f3d2c9cf10788abaf2d584.tar.gz kernel-qcow2-linux-9f67f189939eccaa54f3d2c9cf10788abaf2d584.tar.xz kernel-qcow2-linux-9f67f189939eccaa54f3d2c9cf10788abaf2d584.zip | |
nfsd: notify_change needs elevated write count
Looks like this bug has been here since these write counts were
introduced, not sure why it was just noticed now.
Thanks also to Jan Kara for pointing out the problem.
Cc: stable@vger.kernel.org
Reported-by: Matthew Rahtz <mrahtz@rapitasystems.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6d7be3f80356..eea5ad188984 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -404,6 +404,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, umode_t ftype = 0; __be32 err; int host_err; + bool get_write_count; int size_change = 0; if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE)) @@ -411,10 +412,18 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, if (iap->ia_valid & ATTR_SIZE) ftype = S_IFREG; + /* Callers that do fh_verify should do the fh_want_write: */ + get_write_count = !fhp->fh_dentry; + /* Get inode */ err = fh_verify(rqstp, fhp, ftype, accmode); if (err) goto out; + if (get_write_count) { + host_err = fh_want_write(fhp); + if (host_err) + return nfserrno(host_err); + } dentry = fhp->fh_dentry; inode = dentry->d_inode; |