* [PATCH] Avoid having to provide a fake/invalid fd and path when flushing marks
@ 2011-01-12 12:13 Tvrtko Ursulin
2011-01-19 20:45 ` Eric Paris
0 siblings, 1 reply; 2+ messages in thread
From: Tvrtko Ursulin @ 2011-01-12 12:13 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2021 bytes --]
(Patch also attached in case our outgoing mail servers decide
to munge tabs again.)
Currently for a group to flush marks it has set it needs to
provide a fake or invalid (but resolvable) file descriptor
and path when calling fanotify_mark. This patch pulls the
flush handling a bit up so file descriptor and path are
completely ignored when flushing.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
---
fanotify_user.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 8b61220..09504b1 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -824,6 +824,15 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
group->priority == FS_PRIO_0)
goto fput_and_out;
+ if (flags & FAN_MARK_FLUSH) {
+ if (flags & FAN_MARK_MOUNT)
+ fsnotify_clear_vfsmount_marks_by_group(group);
+ else
+ fsnotify_clear_inode_marks_by_group(group);
+ ret = 0;
+ goto fput_and_out;
+ }
+
ret = fanotify_find_path(dfd, pathname, &path, flags);
if (ret)
goto fput_and_out;
@@ -848,12 +857,6 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
else
ret = fanotify_remove_inode_mark(group, inode, mask, flags);
break;
- case FAN_MARK_FLUSH:
- if (flags & FAN_MARK_MOUNT)
- fsnotify_clear_vfsmount_marks_by_group(group);
- else
- fsnotify_clear_inode_marks_by_group(group);
- break;
default:
ret = -EINVAL;
}
Sophos Limited, The Pentagon, Abingdon Science Park, Abingdon, OX14 3YP, United Kingdom.
Company Reg No 2096520. VAT Reg No GB 991 2418 08.
[-- Attachment #2: fanotify-flush-marks.patch --]
[-- Type: text/x-patch, Size: 1020 bytes --]
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 8b61220..09504b1 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -824,6 +824,15 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
group->priority == FS_PRIO_0)
goto fput_and_out;
+ if (flags & FAN_MARK_FLUSH) {
+ if (flags & FAN_MARK_MOUNT)
+ fsnotify_clear_vfsmount_marks_by_group(group);
+ else
+ fsnotify_clear_inode_marks_by_group(group);
+ ret = 0;
+ goto fput_and_out;
+ }
+
ret = fanotify_find_path(dfd, pathname, &path, flags);
if (ret)
goto fput_and_out;
@@ -848,12 +857,6 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
else
ret = fanotify_remove_inode_mark(group, inode, mask, flags);
break;
- case FAN_MARK_FLUSH:
- if (flags & FAN_MARK_MOUNT)
- fsnotify_clear_vfsmount_marks_by_group(group);
- else
- fsnotify_clear_inode_marks_by_group(group);
- break;
default:
ret = -EINVAL;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Avoid having to provide a fake/invalid fd and path when flushing marks
2011-01-12 12:13 [PATCH] Avoid having to provide a fake/invalid fd and path when flushing marks Tvrtko Ursulin
@ 2011-01-19 20:45 ` Eric Paris
0 siblings, 0 replies; 2+ messages in thread
From: Eric Paris @ 2011-01-19 20:45 UTC (permalink / raw)
To: Tvrtko Ursulin
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
On Wed, 2011-01-12 at 12:13 +0000, Tvrtko Ursulin wrote:
> (Patch also attached in case our outgoing mail servers decide
> to munge tabs again.)
>
> Currently for a group to flush marks it has set it needs to
> provide a fake or invalid (but resolvable) file descriptor
> and path when calling fanotify_mark. This patch pulls the
> flush handling a bit up so file descriptor and path are
> completely ignored when flushing.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Inline patch had spaces instead of tabs. Your attached patch worked and
I committed it. Thanks and sorry to be soooo slow!
-Eric
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-19 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-12 12:13 [PATCH] Avoid having to provide a fake/invalid fd and path when flushing marks Tvrtko Ursulin
2011-01-19 20:45 ` Eric Paris
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).