diff options
author | Eric Paris <eparis@redhat.com> | 2009-12-17 21:24:21 -0500 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 09:58:32 -0400 |
commit | 2a12a9d7814631e918dec93abad856e692d5286d (patch) | |
tree | 12817004ae9667bf83f869606f38050636edeb61 /fs/read_write.c | |
parent | 8112e2d6a7356e8c3ff1f7f3c86f375ed0305705 (diff) |
fsnotify: pass a file instead of an inode to open, read, and write
fanotify, the upcoming notification system actually needs a struct path so it can
do opens in the context of listeners, and it needs a file so it can get f_flags
from the original process. Close was the only operation that already was passing
a struct file to the notification hook. This patch passes a file for access,
modify, and open as well as they are easily available to these hooks.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/read_write.c')
-rw-r--r-- | fs/read_write.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 9c0485236e68..74e36586e4d3 100644 --- a/fs/read_write.c +++ b/fs/read_write.c | |||
@@ -311,7 +311,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) | |||
311 | else | 311 | else |
312 | ret = do_sync_read(file, buf, count, pos); | 312 | ret = do_sync_read(file, buf, count, pos); |
313 | if (ret > 0) { | 313 | if (ret > 0) { |
314 | fsnotify_access(file->f_path.dentry); | 314 | fsnotify_access(file); |
315 | add_rchar(current, ret); | 315 | add_rchar(current, ret); |
316 | } | 316 | } |
317 | inc_syscr(current); | 317 | inc_syscr(current); |
@@ -367,7 +367,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ | |||
367 | else | 367 | else |
368 | ret = do_sync_write(file, buf, count, pos); | 368 | ret = do_sync_write(file, buf, count, pos); |
369 | if (ret > 0) { | 369 | if (ret > 0) { |
370 | fsnotify_modify(file->f_path.dentry); | 370 | fsnotify_modify(file); |
371 | add_wchar(current, ret); | 371 | add_wchar(current, ret); |
372 | } | 372 | } |
373 | inc_syscw(current); | 373 | inc_syscw(current); |
@@ -675,9 +675,9 @@ out: | |||
675 | kfree(iov); | 675 | kfree(iov); |
676 | if ((ret + (type == READ)) > 0) { | 676 | if ((ret + (type == READ)) > 0) { |
677 | if (type == READ) | 677 | if (type == READ) |
678 | fsnotify_access(file->f_path.dentry); | 678 | fsnotify_access(file); |
679 | else | 679 | else |
680 | fsnotify_modify(file->f_path.dentry); | 680 | fsnotify_modify(file); |
681 | } | 681 | } |
682 | return ret; | 682 | return ret; |
683 | } | 683 | } |