From: Amir Goldstein <amir73il@gmail.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jan Kara <jack@suse.cz>, Eric Paris <eparis@redhat.com>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 3/4] fsnotify: simplify API for filename events
Date: Sat, 17 Dec 2016 16:20:33 +0200 [thread overview]
Message-ID: <1481984434-13293-4-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1481984434-13293-1-git-send-email-amir73il@gmail.com>
Do not pass redundant parent inode arg.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
fs/btrfs/ioctl.c | 2 +-
fs/debugfs/inode.c | 6 +++---
fs/devpts/inode.c | 2 +-
fs/namei.c | 16 ++++++++--------
fs/ocfs2/refcounttree.c | 2 +-
fs/tracefs/inode.c | 4 ++--
include/linux/fsnotify.h | 20 +++++++++++++-------
net/sunrpc/rpc_pipe.c | 6 +++---
9 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 5364d4a..059ef91 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -587,7 +587,7 @@ long spufs_create(struct path *path, struct dentry *dentry,
ret = spufs_create_context(dir, dentry, path->mnt, flags, mode,
filp);
if (ret >= 0)
- fsnotify_mkdir(dir, dentry);
+ fsnotify_mkdir(dentry);
return ret;
}
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 33f967d..3fb1af5 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -881,7 +881,7 @@ static noinline int btrfs_mksubvol(const struct path *parent,
async_transid, inherit);
}
if (!error)
- fsnotify_mkdir(dir, dentry);
+ fsnotify_mkdir(dentry);
out_up_read:
up_read(&fs_info->subvol_sem);
out_dput:
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index f17fcf8..c83336f 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -327,7 +327,7 @@ static struct dentry *__debugfs_create_file(const char *name, umode_t mode,
dentry->d_fsdata = (void *)real_fops;
d_instantiate(dentry, inode);
- fsnotify_create(d_inode(dentry->d_parent), dentry);
+ fsnotify_create(dentry);
return end_creating(dentry);
}
@@ -486,7 +486,7 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
inc_nlink(inode);
d_instantiate(dentry, inode);
inc_nlink(d_inode(dentry->d_parent));
- fsnotify_mkdir(d_inode(dentry->d_parent), dentry);
+ fsnotify_mkdir(dentry);
return end_creating(dentry);
}
EXPORT_SYMBOL_GPL(debugfs_create_dir);
@@ -525,7 +525,7 @@ struct dentry *debugfs_create_automount(const char *name,
inc_nlink(inode);
d_instantiate(dentry, inode);
inc_nlink(d_inode(dentry->d_parent));
- fsnotify_mkdir(d_inode(dentry->d_parent), dentry);
+ fsnotify_mkdir(dentry);
return end_creating(dentry);
}
EXPORT_SYMBOL(debugfs_create_automount);
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 108df2e..b073d25 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -549,7 +549,7 @@ struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
if (dentry) {
dentry->d_fsdata = priv;
d_add(dentry, inode);
- fsnotify_create(d_inode(root), dentry);
+ fsnotify_create(dentry);
} else {
iput(inode);
dentry = ERR_PTR(-ENOMEM);
diff --git a/fs/namei.c b/fs/namei.c
index 1c372de..706b685 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2851,7 +2851,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
return error;
error = dir->i_op->create(dir, dentry, mode, want_excl);
if (!error)
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
return error;
}
EXPORT_SYMBOL(vfs_create);
@@ -2995,7 +2995,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
int acc_mode = op->acc_mode;
if (*opened & FILE_CREATED) {
WARN_ON(!(open_flag & O_CREAT));
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
acc_mode = 0;
}
error = may_open(&file->f_path, acc_mode, open_flag);
@@ -3010,7 +3010,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
dentry = file->f_path.dentry;
}
if (*opened & FILE_CREATED)
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
if (unlikely(d_is_negative(dentry))) {
error = -ENOENT;
} else {
@@ -3156,7 +3156,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
open_flag & O_EXCL);
if (error)
goto out_dput;
- fsnotify_create(dir_inode, dentry);
+ fsnotify_create(dentry);
}
if (unlikely(create_error) && !dentry->d_inode) {
error = create_error;
@@ -3645,7 +3645,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
error = dir->i_op->mknod(dir, dentry, mode, dev);
if (!error)
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
return error;
}
EXPORT_SYMBOL(vfs_mknod);
@@ -3737,7 +3737,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
error = dir->i_op->mkdir(dir, dentry, mode);
if (!error)
- fsnotify_mkdir(dir, dentry);
+ fsnotify_mkdir(dentry);
return error;
}
EXPORT_SYMBOL(vfs_mkdir);
@@ -4044,7 +4044,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
error = dir->i_op->symlink(dir, dentry, oldname);
if (!error)
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
return error;
}
EXPORT_SYMBOL(vfs_symlink);
@@ -4160,7 +4160,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
}
inode_unlock(inode);
if (!error)
- fsnotify_link(dir, inode, new_dentry);
+ fsnotify_link(inode, new_dentry);
return error;
}
EXPORT_SYMBOL(vfs_link);
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index d171d2c..f48b402 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4401,7 +4401,7 @@ static int ocfs2_vfs_reflink(struct dentry *old_dentry, struct inode *dir,
error = ocfs2_reflink(old_dentry, dir, new_dentry, preserve);
inode_unlock(inode);
if (!error)
- fsnotify_create(dir, new_dentry);
+ fsnotify_create(new_dentry);
return error;
}
/*
diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index 21d36d2..dbd3980 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -412,7 +412,7 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
inode->i_fop = fops ? fops : &tracefs_file_operations;
inode->i_private = data;
d_instantiate(dentry, inode);
- fsnotify_create(dentry->d_parent->d_inode, dentry);
+ fsnotify_create(dentry);
return end_creating(dentry);
}
@@ -437,7 +437,7 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
inc_nlink(inode);
d_instantiate(dentry, inode);
inc_nlink(dentry->d_parent->d_inode);
- fsnotify_mkdir(dentry->d_parent->d_inode, dentry);
+ fsnotify_mkdir(dentry);
return end_creating(dentry);
}
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index ef54e8f..93efa8c 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -47,6 +47,12 @@ static inline int fsnotify_d_name(struct dentry *dentry, __u32 mask)
dentry->d_name.name, 0);
}
+static inline void audit_dentry_child(const struct dentry *dentry,
+ const unsigned char type)
+{
+ audit_inode_child(d_inode(dentry->d_parent), dentry, type);
+}
+
/* simple call site for access decisions */
static inline int fsnotify_perm(struct file *file, int mask)
{
@@ -115,7 +121,7 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
if (source)
fsnotify(source, FS_MOVE_SELF, moved, FSNOTIFY_EVENT_DENTRY, NULL, 0);
- audit_inode_child(new_dir, moved, AUDIT_TYPE_CHILD_CREATE);
+ audit_dentry_child(moved, AUDIT_TYPE_CHILD_CREATE);
}
/*
@@ -159,9 +165,9 @@ static inline void fsnotify_inoderemove(struct inode *inode)
/*
* fsnotify_create - 'name' was linked in
*/
-static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
+static inline void fsnotify_create(struct dentry *dentry)
{
- audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
+ audit_dentry_child(dentry, AUDIT_TYPE_CHILD_CREATE);
fsnotify_d_name(dentry, FS_CREATE);
}
@@ -171,10 +177,10 @@ static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
* Note: We have to pass also the linked inode ptr as some filesystems leave
* new_dentry->d_inode NULL and instantiate inode pointer later
*/
-static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
+static inline void fsnotify_link(struct inode *inode, struct dentry *new_dentry)
{
fsnotify_link_count(inode);
- audit_inode_child(dir, new_dentry, AUDIT_TYPE_CHILD_CREATE);
+ audit_dentry_child(new_dentry, AUDIT_TYPE_CHILD_CREATE);
fsnotify_d_name(new_dentry, FS_CREATE);
}
@@ -182,11 +188,11 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct
/*
* fsnotify_mkdir - directory 'name' was created
*/
-static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
+static inline void fsnotify_mkdir(struct dentry *dentry)
{
__u32 mask = (FS_CREATE | FS_ISDIR);
- audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
+ audit_dentry_child(dentry, AUDIT_TYPE_CHILD_CREATE);
fsnotify_d_name(dentry, mask);
}
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 61a504f..9f2de3f 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -524,7 +524,7 @@ static int __rpc_create(struct inode *dir, struct dentry *dentry,
err = __rpc_create_common(dir, dentry, S_IFREG | mode, i_fop, private);
if (err)
return err;
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
return 0;
}
@@ -539,7 +539,7 @@ static int __rpc_mkdir(struct inode *dir, struct dentry *dentry,
if (err)
return err;
inc_nlink(dir);
- fsnotify_mkdir(dir, dentry);
+ fsnotify_mkdir(dentry);
return 0;
}
@@ -594,7 +594,7 @@ static int __rpc_mkpipe_dentry(struct inode *dir, struct dentry *dentry,
rpci = RPC_I(d_inode(dentry));
rpci->private = private;
rpci->pipe = pipe;
- fsnotify_create(dir, dentry);
+ fsnotify_create(dentry);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-12-17 14:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-17 14:20 [PATCH 0/4] fsnotify: misc cleanups Amir Goldstein
2016-12-17 14:20 ` [PATCH 1/4] fsnotify: pass dentry instead of inode when available Amir Goldstein
2016-12-17 14:20 ` [PATCH 2/4] fsnotify: annotate filename events Amir Goldstein
2016-12-17 14:20 ` Amir Goldstein [this message]
2016-12-17 14:20 ` [PATCH 4/4] fsnotify: make MOVED_FROM a dentry event Amir Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1481984434-13293-4-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=eparis@redhat.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).