diff options
| author | Andreas Gruenbacher | 2009-12-18 03:24:27 +0100 |
|---|---|---|
| committer | Eric Paris | 2010-07-28 15:58:56 +0200 |
| commit | 32c3263221bd63316815286dccacdc7abfd7f3c4 (patch) | |
| tree | 9dad12d5b966cf42d7506e10fb2e3c8d955415d3 /fs/notify/fanotify | |
| parent | fanotify: create_fd cleanup (diff) | |
| download | kernel-qcow2-linux-32c3263221bd63316815286dccacdc7abfd7f3c4.tar.gz kernel-qcow2-linux-32c3263221bd63316815286dccacdc7abfd7f3c4.tar.xz kernel-qcow2-linux-32c3263221bd63316815286dccacdc7abfd7f3c4.zip | |
fanotify: Add pids to events
Pass the process identifiers of the triggering processes to fanotify
listeners: this information is useful for event filtering and logging.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/fanotify')
| -rw-r--r-- | fs/notify/fanotify/fanotify.c | 5 | ||||
| -rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 5b0b6b485a9c..881067dc7923 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -10,8 +10,9 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new) { pr_debug("%s: old=%p new=%p\n", __func__, old, new); - if ((old->to_tell == new->to_tell) && - (old->data_type == new->data_type)) { + if (old->to_tell == new->to_tell && + old->data_type == new->data_type && + old->tgid == new->tgid) { switch (old->data_type) { case (FSNOTIFY_EVENT_PATH): if ((old->path.mnt == new->path.mnt) && diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index cf9c30009825..66e38fc052b2 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -103,6 +103,7 @@ static ssize_t fill_event_metadata(struct fsnotify_group *group, metadata->event_len = FAN_EVENT_METADATA_LEN; metadata->vers = FANOTIFY_METADATA_VERSION; metadata->mask = fanotify_outgoing_mask(event->mask); + metadata->pid = pid_vnr(event->tgid); metadata->fd = create_fd(group, event); return metadata->fd; |