Commit 79bf7c73 authored by Sage Weil's avatar Sage Weil Committed by Al Viro
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 64252c75

fs/9p/vfs_inode.c

+1 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ int v9fs_vfs_unlink(struct inode *i, struct dentry *d) 


int v9fs_vfs_rmdir(struct inode *i, struct dentry *d)

{

	dentry_unhash(d);

	return v9fs_remove(i, d, 1);

}

fs/affs/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ affs_rmdir(struct inode *dir, struct dentry *dentry) 
		 dentry->d_inode->i_ino,

		 (int)dentry->d_name.len, dentry->d_name.name);



	dentry_unhash(dentry);



	return affs_remove_header(dentry);

}

fs/afs/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -845,6 +845,8 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry) 
	_enter("{%x:%u},{%s}",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name);



	dentry_unhash(dentry);



	ret = -ENAMETOOLONG;

	if (dentry->d_name.len >= AFSNAMEMAX)

		goto error;

fs/autofs4/root.c

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry) 
	if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))

		return -EACCES;



	dentry_unhash(dentry);



	if (atomic_dec_and_test(&ino->count)) {

		p_ino = autofs4_dentry_ino(dentry->d_parent);

		if (p_ino && dentry->d_parent != dentry)

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -3062,6 +3062,8 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) 
	    inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)

		return -ENOTEMPTY;



	dentry_unhash(dentry);



	trans = __unlink_start_trans(dir, dentry);

	if (IS_ERR(trans))

		return PTR_ERR(trans);

CRA Git | Maintained and supported by SUSTech CRA and CCSE