@@ -70,13 +70,8 @@ static void hypfs_remove(struct dentry *dentry)
parent = dentry->d_parent;
inode_lock(d_inode(parent));
- if (simple_positive(dentry)) {
- if (d_is_dir(dentry))
- simple_rmdir(d_inode(parent), dentry);
- else
- simple_unlink(d_inode(parent), dentry);
- }
- d_delete(dentry);
+ if (simple_positive(dentry))
+ simple_remove(d_inode(parent), dentry);
dput(dentry);
inode_unlock(d_inode(parent));
}
@@ -491,8 +491,7 @@ static int remove_device_files(struct super_block *sb,
}
remove_file(dir, "flash");
inode_unlock(d_inode(dir));
- ret = simple_rmdir(d_inode(root), dir);
- d_delete(dir);
+ ret = simple_remove(d_inode(root), dir);
dput(dir);
bail:
@@ -617,13 +617,10 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
}
EXPORT_SYMBOL_GPL(debugfs_create_symlink);
-static void __debugfs_remove_file(struct dentry *dentry, struct dentry *parent)
+static void __debugfs_file_removed(struct dentry *dentry)
{
struct debugfs_fsdata *fsd;
- simple_unlink(d_inode(parent), dentry);
- d_delete(dentry);
-
/*
* Paired with the closing smp_mb() implied by a successful
* cmpxchg() in debugfs_file_get(): either
@@ -643,18 +640,9 @@ static int __debugfs_remove(struct dentry *dentry, struct dentry *parent)
int ret = 0;
if (simple_positive(dentry)) {
- dget(dentry);
- if (!d_is_reg(dentry)) {
- if (d_is_dir(dentry))
- ret = simple_rmdir(d_inode(parent), dentry);
- else
- simple_unlink(d_inode(parent), dentry);
- if (!ret)
- d_delete(dentry);
- } else {
- __debugfs_remove_file(dentry, parent);
- }
- dput(dentry);
+ ret = simple_remove(d_inode(parent), dentry);
+ if (d_is_reg(dentry))
+ __debugfs_file_removed(dentry);
}
return ret;
}
@@ -501,25 +501,10 @@ __init struct dentry *tracefs_create_instance_dir(const char *name,
static int __tracefs_remove(struct dentry *dentry, struct dentry *parent)
{
- int ret = 0;
-
- if (simple_positive(dentry)) {
- if (dentry->d_inode) {
- dget(dentry);
- switch (dentry->d_inode->i_mode & S_IFMT) {
- case S_IFDIR:
- ret = simple_rmdir(parent->d_inode, dentry);
- break;
- default:
- simple_unlink(parent->d_inode, dentry);
- break;
- }
- if (!ret)
- d_delete(dentry);
- dput(dentry);
- }
- }
- return ret;
+ if (simple_positive(dentry))
+ return simple_remove(d_inode(parent), dentry);
+
+ return 0;
}
/**
@@ -593,24 +593,12 @@ static int __rpc_mkpipe_dentry(struct inode *dir, struct dentry *dentry,
static int __rpc_rmdir(struct inode *dir, struct dentry *dentry)
{
- int ret;
-
- dget(dentry);
- ret = simple_rmdir(dir, dentry);
- d_delete(dentry);
- dput(dentry);
- return ret;
+ return simple_remove(dir, dentry);
}
static int __rpc_unlink(struct inode *dir, struct dentry *dentry)
{
- int ret;
-
- dget(dentry);
- ret = simple_unlink(dir, dentry);
- d_delete(dentry);
- dput(dentry);
- return ret;
+ return simple_remove(dir, dentry);
}
static int __rpc_rmpipe(struct inode *dir, struct dentry *dentry)
@@ -351,11 +351,7 @@ static void aafs_remove(struct dentry *dentry)
dir = d_inode(dentry->d_parent);
inode_lock(dir);
if (simple_positive(dentry)) {
- if (d_is_dir(dentry))
- simple_rmdir(dir, dentry);
- else
- simple_unlink(dir, dentry);
- d_delete(dentry);
+ simple_remove(dir, dentry);
dput(dentry);
}
inode_unlock(dir);
Convert some filesystems to use the new simple_remove() helper. This will allow them to generate fsnotify delete events after the fsnotify_nameremove() hook is removed from d_delete(). Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- arch/s390/hypfs/inode.c | 9 ++------- drivers/infiniband/hw/qib/qib_fs.c | 3 +-- fs/debugfs/inode.c | 20 ++++---------------- fs/tracefs/inode.c | 23 ++++------------------- net/sunrpc/rpc_pipe.c | 16 ++-------------- security/apparmor/apparmorfs.c | 6 +----- 6 files changed, 14 insertions(+), 63 deletions(-)