Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d95afd5 authored by Al Viro's avatar Al Viro
Browse files

kill dentry_unhash() 



the last user is gone

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f8b31710

fs/namei.c

+0 −25
Original line number Diff line number Diff line
@@ -3685,31 +3685,6 @@ SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode) 
	return sys_mkdirat(AT_FDCWD, pathname, mode);

}



/*

 * The dentry_unhash() helper will try to drop the dentry early: we

 * should have a usage count of 1 if we're the only user of this

 * dentry, and if that is true (possibly after pruning the dcache),

 * then we drop the dentry now.

 *

 * A low-level filesystem can, if it choses, legally

 * do a

 *

 *	if (!d_unhashed(dentry))

 *		return -EBUSY;

 *

 * if it cannot handle the case of removing a directory

 * that is still in use by something else..

 */

void dentry_unhash(struct dentry *dentry)

{

	shrink_dcache_parent(dentry);

	spin_lock(&dentry->d_lock);

	if (dentry->d_lockref.count == 1)

		__d_drop(dentry);

	spin_unlock(&dentry->d_lock);

}

EXPORT_SYMBOL(dentry_unhash);



int vfs_rmdir(struct inode *dir, struct dentry *dentry)

{

	int error = may_delete(dir, dentry, 1);

include/linux/fs.h

+0 −5
Original line number Diff line number Diff line
@@ -1539,11 +1539,6 @@ extern int vfs_unlink(struct inode *, struct dentry *, struct inode **); 
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *, struct inode **, unsigned int);

extern int vfs_whiteout(struct inode *, struct dentry *);



/*

 * VFS dentry helper functions.

 */

extern void dentry_unhash(struct dentry *dentry);



/*

 * VFS file helper functions.

 */