aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 16:06:06 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:47 -0400
commit79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch)
tree74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/nfs
parent64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff)
vfs: push dentry_unhash on rmdir into file systems
Only a few file systems need this. Start by pushing it down into each fs rmdir method (except gfs2 and xfs) so it can be dealt with on a per-fs basis. This does not change behavior for any in-tree file systems. Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 7237672216c8..48483b562361 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1748,6 +1748,8 @@ static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
1748 dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n", 1748 dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
1749 dir->i_sb->s_id, dir->i_ino, dentry->d_name.name); 1749 dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
1750 1750
1751 dentry_unhash(dentry);
1752
1751 error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name); 1753 error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
1752 /* Ensure the VFS deletes this inode */ 1754 /* Ensure the VFS deletes this inode */
1753 if (error == 0 && dentry->d_inode != NULL) 1755 if (error == 0 && dentry->d_inode != NULL)