commit ba6c05928dcafc7e0a0c8e4ee6a293ba47190fd4
author Trond Myklebust <Trond.Myklebust@netapp.com> Fri Aug 30 12:24:25 2013 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Tue Sep 03 15:26:29 2013 -0400
tree 3b32adfdc8fb978f1933d43591e36ed0b14897d6
parent a5250def7c4549a6a1cd8257900bef9c12ffc2fc

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>

include/linux/nfs_fs.h

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 7125cef..3ea4cde 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -524,6 +524,7 @@
  * linux/fs/nfs/unlink.c
  */
 extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
+extern void nfs_wait_on_sillyrename(struct dentry *dentry);
 extern void nfs_block_sillyrename(struct dentry *dentry);
 extern void nfs_unblock_sillyrename(struct dentry *dentry);
 extern int  nfs_sillyrename(struct inode *dir, struct dentry *dentry);