diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-08-30 18:24:25 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-03 21:26:29 +0200 |
| commit | ba6c05928dcafc7e0a0c8e4ee6a293ba47190fd4 (patch) | |
| tree | 3b32adfdc8fb978f1933d43591e36ed0b14897d6 /fs/nfs/unlink.c | |
| parent | NFSv4: use the mach cred for SECINFO w/ integrity (diff) | |
| download | linux-ba6c05928dcafc7e0a0c8e4ee6a293ba47190fd4.tar.xz linux-ba6c05928dcafc7e0a0c8e4ee6a293ba47190fd4.zip | |
NFS: Ensure that rmdir() waits for sillyrenames to complete
If an NFS client does
mkdir("dir");
fd = open("dir/file");
unlink("dir/file");
close(fd);
rmdir("dir");
then the asynchronous nature of the sillyrename operation means that
we can end up getting EBUSY for the rmdir() in the above test. Fix
that by ensuring that we wait for any in-progress sillyrenames
before sending the rmdir() to the server.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/unlink.c')
| -rw-r--r-- | fs/nfs/unlink.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 2c1485d18419..bb939edd4c99 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -207,6 +207,13 @@ out_free: return ret; } +void nfs_wait_on_sillyrename(struct dentry *dentry) +{ + struct nfs_inode *nfsi = NFS_I(dentry->d_inode); + + wait_event(nfsi->waitqueue, atomic_read(&nfsi->silly_count) <= 1); +} + void nfs_block_sillyrename(struct dentry *dentry) { struct nfs_inode *nfsi = NFS_I(dentry->d_inode); |