summaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-01-11 12:54:39 -0500
committerJ. Bruce Fields <bfields@redhat.com>2011-01-13 21:04:08 -0500
commit6a76bebefe15d9a08864f824d7f8d5beaf37c997 (patch)
treed52ae82116e8681c094f62f70cdb12b654dd9f29 /fs/nfsd
parent9ce137eee4febaabca81143be07d4205d2bd52d4 (diff)
downloadlinux-3.10-6a76bebefe15d9a08864f824d7f8d5beaf37c997.tar.gz
linux-3.10-6a76bebefe15d9a08864f824d7f8d5beaf37c997.tar.bz2
linux-3.10-6a76bebefe15d9a08864f824d7f8d5beaf37c997.zip
nfsd4: break lease on nfsd setattr
Leases (delegations) should really be broken on any metadata change, not just on size change. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/vfs.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 0a01e2fc5dd..f97d4356431 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -374,14 +374,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
goto out;
}
- /*
- * If we are changing the size of the file, then
- * we need to break all leases.
- */
- host_err = break_lease(inode, O_WRONLY | O_NONBLOCK);
- if (host_err) /* ENOMEM or EWOULDBLOCK */
- goto out_nfserr;
-
host_err = get_write_access(inode);
if (host_err)
goto out_nfserr;
@@ -422,7 +414,11 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
err = nfserr_notsync;
if (!check_guard || guardtime == inode->i_ctime.tv_sec) {
+ host_err = break_lease(inode, O_WRONLY | O_NONBLOCK);
+ if (host_err)
+ goto out_nfserr;
fh_lock(fhp);
+
host_err = notify_change(dentry, iap);
err = nfserrno(host_err);
fh_unlock(fhp);