From patchwork Wed Nov 14 17:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10682955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 945F0109C for ; Wed, 14 Nov 2018 17:44:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8826C287C0 for ; Wed, 14 Nov 2018 17:44:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CA4E2BDA1; Wed, 14 Nov 2018 17:44:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEBA028ABB for ; Wed, 14 Nov 2018 17:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728085AbeKODsI (ORCPT ); Wed, 14 Nov 2018 22:48:08 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33443 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728023AbeKODsI (ORCPT ); Wed, 14 Nov 2018 22:48:08 -0500 Received: by mail-wm1-f67.google.com with SMTP id f19-v6so14071039wmb.0 for ; Wed, 14 Nov 2018 09:43:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tAF+X2KtLPneGT+bWcsbGFgHe3thUibIoIw0rNMbhWc=; b=Z8M3QGNb/yUXCJkEf81ax0XBx3xSaCACL9X5z/JJjRSM+JiHiQKC+0QucLTqdXH3lf 5QGZR04B2aZ8dCDY8URoq3dWztfHbzPP4WvYltXnxdnFx2na1sWVhULvqUVtoycqRKER B3EpRrmG8SQbccI0Kh7qSVvKOFGA+/MKO8zKaKUldBofJDi+7PzNcUT7/DOUBRUHz4hK DYqtzb+RJ9tbint+4GbrFDgothcYmlkteJdd84lJ3kd2s6VD9fPGjCioIQCsyw4n0s4d kW/Kaxu0NGtCiiC6tGMMWghmFJaj5lVIRKBGUKfIhg2AxKnBahzvg8IYEbzlZOu0Htkz ehwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tAF+X2KtLPneGT+bWcsbGFgHe3thUibIoIw0rNMbhWc=; b=k1/c6sqY86F2gSDxbwE2VlRaJSoAWGZ+B8faZFFCaub43C/daT8CGaHK34G+c3woUj 28QP7LsntHHElRovIeA4Wn0vcb5hZG9Pu2ftA+577Bko+4pIGr40lcsxzSGIIh/TYbOt PcbWYxnvWBNwuy1dZ2kwbnagbABanRp6lzA/H3T0EMi8lQBR8k1qAVzvxI4X3W0ggpfg JwXZCRDhg+NuDbJQm3irr6v18tKfw0sOEBPnUopT7/uDLTEjgeKHc6RUiw6siWYBhMTA 0x3J4joe9RCvFlIGDowRNRunzwwNvpF39eJhkQxyO1wC3AHCvUNZvbTsy+FCD1y7uZBI 2ZhQ== X-Gm-Message-State: AGRZ1gKyhiguhwGSAnYaD7yXoCvWp0tcbBd806kNo/nHidgcXqROG83t TdtimJlxcxEj+Tw5gylmQEu4Ttfg X-Google-Smtp-Source: AJdET5ebQPVcxe3HSWPly+3U13pAFCx33dmUgs/cltPbkBDxf/urcn3kxZsk0GhptY8GYgm47ACj9A== X-Received: by 2002:a7b:c052:: with SMTP id u18-v6mr2610636wmc.29.1542217437008; Wed, 14 Nov 2018 09:43:57 -0800 (PST) Received: from localhost.localdomain ([37.46.46.74]) by smtp.gmail.com with ESMTPSA id d18-v6sm8587887wre.25.2018.11.14.09.43.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 09:43:56 -0800 (PST) From: Amir Goldstein To: Jan Kara Cc: Matthew Bobrowski , linux-fsdevel@vger.kernel.org Subject: [PATCH v2 3/5] fsnotify: simplify API for filename events Date: Wed, 14 Nov 2018 19:43:42 +0200 Message-Id: <20181114174344.17530-4-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114174344.17530-1-amir73il@gmail.com> References: <20181114174344.17530-1-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Do not pass redundant parent inode arg. Signed-off-by: Amir Goldstein --- 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 | 18 +++++++++--------- fs/ocfs2/refcounttree.c | 2 +- fs/tracefs/inode.c | 4 ++-- include/linux/fsnotify.h | 20 +++++++++++++------- net/sunrpc/rpc_pipe.c | 6 +++--- 9 files changed, 34 insertions(+), 28 deletions(-) diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index db329d4bf1c3..a40de703f586 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 802a628e9f7d..8af6258cb0a2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -979,7 +979,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 13b01351dd1c..ca9945f7db59 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -361,7 +361,7 @@ static struct dentry *__debugfs_create_file(const char *name, umode_t mode, DEBUGFS_FSDATA_IS_REAL_FOPS_BIT); d_instantiate(dentry, inode); - fsnotify_create(d_inode(dentry->d_parent), dentry); + fsnotify_create(dentry); return end_creating(dentry); } @@ -520,7 +520,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); @@ -559,7 +559,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 c53814539070..f15a33399a5b 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -589,7 +589,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 0cab6494978c..1d743adf90a0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2911,7 +2911,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); @@ -2932,7 +2932,7 @@ int vfs_mkobj(struct dentry *dentry, umode_t mode, return error; error = f(dentry, mode, arg); if (!error) - fsnotify_create(dir, dentry); + fsnotify_create(dentry); return error; } EXPORT_SYMBOL(vfs_mkobj); @@ -3081,7 +3081,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry, int acc_mode = op->acc_mode; if (file->f_mode & FMODE_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); @@ -3095,7 +3095,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry, dentry = file->f_path.dentry; } if (file->f_mode & FMODE_CREATED) - fsnotify_create(dir, dentry); + fsnotify_create(dentry); if (unlikely(d_is_negative(dentry))) { error = -ENOENT; } else { @@ -3235,7 +3235,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; @@ -3718,7 +3718,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); @@ -3816,7 +3816,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); @@ -4126,7 +4126,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); @@ -4248,7 +4248,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 a35259eebc56..7ff695d1a3e4 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -4417,7 +4417,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 7098c49f3693..4644ddc77595 100644 --- a/fs/tracefs/inode.c +++ b/fs/tracefs/inode.c @@ -410,7 +410,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); } @@ -435,7 +435,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 d00ec5838d6e..4fb2fa0b31d2 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -63,6 +63,12 @@ static inline int fsnotify_path(struct inode *inode, const struct path *path, return fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 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) { @@ -129,7 +135,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); } /* @@ -173,9 +179,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); } @@ -185,10 +191,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); } @@ -196,11 +202,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 4fda18d47e2c..2dc1a0054c40 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; }