Commit ba6c0592 authored by Trond Myklebust's avatar Trond Myklebust

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a5250def
...@@ -1694,12 +1694,19 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry) ...@@ -1694,12 +1694,19 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
dir->i_sb->s_id, dir->i_ino, dentry->d_name.name); dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
trace_nfs_rmdir_enter(dir, dentry); trace_nfs_rmdir_enter(dir, dentry);
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name); if (dentry->d_inode) {
/* Ensure the VFS deletes this inode */ nfs_wait_on_sillyrename(dentry);
if (error == 0 && dentry->d_inode != NULL) error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
clear_nlink(dentry->d_inode); /* Ensure the VFS deletes this inode */
else if (error == -ENOENT) switch (error) {
nfs_dentry_handle_enoent(dentry); case 0:
clear_nlink(dentry->d_inode);
break;
case -ENOENT:
nfs_dentry_handle_enoent(dentry);
}
} else
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
trace_nfs_rmdir_exit(dir, dentry, error); trace_nfs_rmdir_exit(dir, dentry, error);
return error; return error;
......
...@@ -207,6 +207,13 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data) ...@@ -207,6 +207,13 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
return ret; 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) void nfs_block_sillyrename(struct dentry *dentry)
{ {
struct nfs_inode *nfsi = NFS_I(dentry->d_inode); struct nfs_inode *nfsi = NFS_I(dentry->d_inode);
......
...@@ -524,6 +524,7 @@ static inline void nfs4_label_free(void *label) {} ...@@ -524,6 +524,7 @@ static inline void nfs4_label_free(void *label) {}
* linux/fs/nfs/unlink.c * linux/fs/nfs/unlink.c
*/ */
extern void nfs_complete_unlink(struct dentry *dentry, struct inode *); 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_block_sillyrename(struct dentry *dentry);
extern void nfs_unblock_sillyrename(struct dentry *dentry); extern void nfs_unblock_sillyrename(struct dentry *dentry);
extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry); extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment