diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-02-06 22:46:30 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-02-14 16:35:19 +0100 |
| commit | 83f6b0c18204f68961f58b9f69e5dba0d36056a2 (patch) | |
| tree | 87d08d398b61bee64a2ebc5a538f57f752c6c0d9 /fs | |
| parent | nfsd4: acquire only one lease per file (diff) | |
| download | linux-83f6b0c18204f68961f58b9f69e5dba0d36056a2.tar.xz linux-83f6b0c18204f68961f58b9f69e5dba0d36056a2.zip | |
nfsd: break lease on unlink due to rename
4795bb37effb7b8fe77e2d2034545d062d3788a8 "nfsd: break lease on unlink,
link, and rename", only broke the lease on the file that was being
renamed, and didn't handle the case where the target path refers to an
already-existing file that will be unlinked by a rename--in that case
the target file should have any leases broken as well.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 30c73f8a5791..da1d9701f8e4 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1744,6 +1744,13 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, host_err = nfsd_break_lease(odentry->d_inode); if (host_err) goto out_drop_write; + if (ndentry->d_inode) { + host_err = nfsd_break_lease(ndentry->d_inode); + if (host_err) + goto out_drop_write; + } + if (host_err) + goto out_drop_write; host_err = vfs_rename(fdir, odentry, tdir, ndentry); if (!host_err) { host_err = commit_metadata(tfhp); |