From: Amir Goldstein <amir73il@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
Marko Rauhamaa <marko.rauhamaa@f-secure.com>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 16/20] fsnotify: generalize fsnotify_detach_connector_from_object()
Date: Thu, 5 Apr 2018 16:18:17 +0300 [thread overview]
Message-ID: <1522934301-6520-17-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1522934301-6520-1-git-send-email-amir73il@gmail.com>
Use helper fsnotify_connector_obj() helper to reduce object type
dependent code.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/notify/mark.c | 21 ++++++++-------------
include/linux/fsnotify_backend.h | 1 +
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 53bacbce1145..3b19ed700ac3 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -177,19 +177,14 @@ static void fsnotify_connector_destroy_workfn(struct work_struct *work)
static struct inode *fsnotify_detach_connector_from_object(
struct fsnotify_mark_connector *conn)
{
- struct inode *inode = NULL;
-
- if (conn->type == FSNOTIFY_OBJ_TYPE_INODE) {
- inode = conn->inode;
- rcu_assign_pointer(inode->i_fsnotify.marks, NULL);
- inode->i_fsnotify.mask = 0;
- conn->inode = NULL;
- conn->type = FSNOTIFY_OBJ_TYPE_DETACHED;
- } else if (conn->type == FSNOTIFY_OBJ_TYPE_VFSMOUNT) {
- rcu_assign_pointer(real_mount(conn->mnt)->mnt_fsnotify.marks,
- NULL);
- real_mount(conn->mnt)->mnt_fsnotify.mask = 0;
- conn->mnt = NULL;
+ struct fsnotify_obj *obj = fsnotify_connector_obj(conn);
+ struct inode *inode = (conn->type == FSNOTIFY_OBJ_TYPE_INODE) ?
+ conn->inode : NULL;
+
+ if (obj) {
+ rcu_assign_pointer(obj->marks, NULL);
+ obj->mask = 0;
+ conn->object = NULL;
conn->type = FSNOTIFY_OBJ_TYPE_DETACHED;
}
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 9a908b96909e..abbd7311077f 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -275,6 +275,7 @@ struct fsnotify_mark_connector {
spinlock_t lock;
unsigned int type; /* Type of object [lock] */
union { /* Object pointer [lock] */
+ void *object;
struct inode *inode;
struct vfsmount *mnt;
};
--
2.7.4
next prev parent reply other threads:[~2018-04-05 13:17 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-05 13:18 [PATCH v2 00/20] fanotify: super block mark Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 01/20] fanotify: fix logic of events on child Amir Goldstein
2018-04-13 13:50 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 02/20] fsnotify: fix ignore mask logic in send_to_group() Amir Goldstein
2018-04-13 13:53 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 03/20] fsnotify: fix typo in a comment about mark->g_list Amir Goldstein
2018-04-13 13:56 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 04/20] MAINTAINERS: add an entry for FSNOTIFY infrastructure Amir Goldstein
2018-04-13 13:56 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 05/20] fsnotify: use type id to identify connector object type Amir Goldstein
2018-04-17 16:26 ` Jan Kara
2018-04-17 17:45 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 06/20] fsnotify: remove redundant arguments to handle_event() Amir Goldstein
2018-04-17 16:33 ` Jan Kara
2018-04-17 17:59 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 07/20] fsnotify: introduce marks iteration helpers Amir Goldstein
2018-04-17 16:38 ` Jan Kara
2018-04-17 18:37 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 08/20] fsnotify: generalize iteration of marks by object type Amir Goldstein
2018-04-17 17:01 ` Jan Kara
2018-04-17 19:11 ` Amir Goldstein
2018-04-18 8:34 ` Jan Kara
2018-04-18 12:31 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 09/20] fsnotify: generalize send_to_group() Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 10/20] fanotify: generalize fanotify_should_send_event() Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 11/20] fsnotify: add fsnotify_add_inode_mark() wrappers Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 12/20] fsnotify: introduce prototype struct fsnotify_obj Amir Goldstein
2018-04-19 12:14 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 13/20] fsnotify: pass fsnotify_obj instead of **connp argument Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 14/20] fsnotify: pass object and object type to fsnotify_add_mark() Amir Goldstein
2018-04-19 12:23 ` Jan Kara
2018-04-19 14:28 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 15/20] fsnotify: make fsnotify_recalc_mask() unaware of object type Amir Goldstein
2018-04-06 9:03 ` kbuild test robot
2018-04-05 13:18 ` Amir Goldstein [this message]
2018-04-19 13:59 ` [PATCH v2 16/20] fsnotify: generalize fsnotify_detach_connector_from_object() Jan Kara
2018-04-19 14:07 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 17/20] fsnotify: add super block object type Amir Goldstein
2018-04-06 6:01 ` kbuild test robot
2018-04-06 11:04 ` Amir Goldstein
2018-04-19 12:41 ` Jan Kara
2018-04-19 14:27 ` Amir Goldstein
2018-04-19 12:39 ` Jan Kara
2018-04-05 13:18 ` [PATCH v2 18/20] fsnotify: send path type events to group with super block marks Amir Goldstein
2018-04-19 13:49 ` Jan Kara
2018-04-19 14:19 ` Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 19/20] fanotify: factor out helpers to add/remove mark Amir Goldstein
2018-04-05 13:18 ` [PATCH v2 20/20] fanotify: add API to attach/detach super block mark 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=1522934301-6520-17-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=marko.rauhamaa@f-secure.com \
--cc=miklos@szeredi.hu \
/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).