diff options
Diffstat (limited to 'fs/notify/notification.c')
-rw-r--r-- | fs/notify/notification.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/fs/notify/notification.c b/fs/notify/notification.c index dddecc74e63d..c69b18b9aba5 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c | |||
@@ -78,6 +78,7 @@ void fsnotify_put_event(struct fsnotify_event *event) | |||
78 | if (event->data_type == FSNOTIFY_EVENT_PATH) | 78 | if (event->data_type == FSNOTIFY_EVENT_PATH) |
79 | path_put(&event->path); | 79 | path_put(&event->path); |
80 | 80 | ||
81 | kfree(event->file_name); | ||
81 | kmem_cache_free(fsnotify_event_cachep, event); | 82 | kmem_cache_free(fsnotify_event_cachep, event); |
82 | } | 83 | } |
83 | } | 84 | } |
@@ -262,6 +263,9 @@ static void initialize_event(struct fsnotify_event *event) | |||
262 | event->data_type = FSNOTIFY_EVENT_NONE; | 263 | event->data_type = FSNOTIFY_EVENT_NONE; |
263 | 264 | ||
264 | event->to_tell = NULL; | 265 | event->to_tell = NULL; |
266 | |||
267 | event->file_name = NULL; | ||
268 | event->name_len = 0; | ||
265 | } | 269 | } |
266 | 270 | ||
267 | /* | 271 | /* |
@@ -274,9 +278,10 @@ static void initialize_event(struct fsnotify_event *event) | |||
274 | * @mask what actually happened. | 278 | * @mask what actually happened. |
275 | * @data pointer to the object which was actually affected | 279 | * @data pointer to the object which was actually affected |
276 | * @data_type flag indication if the data is a file, path, inode, nothing... | 280 | * @data_type flag indication if the data is a file, path, inode, nothing... |
281 | * @name the filename, if available | ||
277 | */ | 282 | */ |
278 | struct fsnotify_event *fsnotify_create_event(struct inode *to_tell, __u32 mask, | 283 | struct fsnotify_event *fsnotify_create_event(struct inode *to_tell, __u32 mask, |
279 | void *data, int data_type) | 284 | void *data, int data_type, const char *name) |
280 | { | 285 | { |
281 | struct fsnotify_event *event; | 286 | struct fsnotify_event *event; |
282 | 287 | ||
@@ -285,6 +290,15 @@ struct fsnotify_event *fsnotify_create_event(struct inode *to_tell, __u32 mask, | |||
285 | return NULL; | 290 | return NULL; |
286 | 291 | ||
287 | initialize_event(event); | 292 | initialize_event(event); |
293 | |||
294 | if (name) { | ||
295 | event->file_name = kstrdup(name, GFP_KERNEL); | ||
296 | if (!event->file_name) { | ||
297 | kmem_cache_free(fsnotify_event_cachep, event); | ||
298 | return NULL; | ||
299 | } | ||
300 | event->name_len = strlen(event->file_name); | ||
301 | } | ||
288 | event->to_tell = to_tell; | 302 | event->to_tell = to_tell; |
289 | 303 | ||
290 | switch (data_type) { | 304 | switch (data_type) { |