diff options
author | Eric Paris <eparis@redhat.com> | 2009-05-21 17:01:43 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2009-06-11 14:57:53 -0400 |
commit | 62ffe5dfba056f7ba81d710fee9f28c58a42fdd6 (patch) | |
tree | ac0d4afc641bdc8ff76779545fde9c6ae539bdaf /fs/notify/fsnotify.c | |
parent | a2d8bc6cb4a3024661baf877242f123787d0c054 (diff) |
fsnotify: include pathnames with entries when possible
When inotify wants to send events to a directory about a child it includes
the name of the original file. This patch collects that filename and makes
it available for notification.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/notify/fsnotify.c')
-rw-r--r-- | fs/notify/fsnotify.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 7fc760067a62..675129fa9fdd 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c | |||
@@ -114,7 +114,8 @@ void __fsnotify_parent(struct dentry *dentry, __u32 mask) | |||
114 | * specifies these are events which came from a child. */ | 114 | * specifies these are events which came from a child. */ |
115 | mask |= FS_EVENT_ON_CHILD; | 115 | mask |= FS_EVENT_ON_CHILD; |
116 | 116 | ||
117 | fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE); | 117 | fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE, |
118 | dentry->d_name.name); | ||
118 | dput(parent); | 119 | dput(parent); |
119 | } | 120 | } |
120 | 121 | ||
@@ -131,7 +132,7 @@ EXPORT_SYMBOL_GPL(__fsnotify_parent); | |||
131 | * out to all of the registered fsnotify_group. Those groups can then use the | 132 | * out to all of the registered fsnotify_group. Those groups can then use the |
132 | * notification event in whatever means they feel necessary. | 133 | * notification event in whatever means they feel necessary. |
133 | */ | 134 | */ |
134 | void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is) | 135 | void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const char *file_name) |
135 | { | 136 | { |
136 | struct fsnotify_group *group; | 137 | struct fsnotify_group *group; |
137 | struct fsnotify_event *event = NULL; | 138 | struct fsnotify_event *event = NULL; |
@@ -156,7 +157,7 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is) | |||
156 | if (!group->ops->should_send_event(group, to_tell, mask)) | 157 | if (!group->ops->should_send_event(group, to_tell, mask)) |
157 | continue; | 158 | continue; |
158 | if (!event) { | 159 | if (!event) { |
159 | event = fsnotify_create_event(to_tell, mask, data, data_is); | 160 | event = fsnotify_create_event(to_tell, mask, data, data_is, file_name); |
160 | /* shit, we OOM'd and now we can't tell, maybe | 161 | /* shit, we OOM'd and now we can't tell, maybe |
161 | * someday someone else will want to do something | 162 | * someday someone else will want to do something |
162 | * here */ | 163 | * here */ |