diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 13:02:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 13:02:16 +1100 |
| commit | a448c9a8528b6c27c9e8f4d341b264330c37c45b (patch) | |
| tree | ae9967dab0b3724c5fc23c10a4686913845c49d2 /fs/read_write.c | |
| parent | 0379192d9d7c15021c8a85de948c6b8622015c6f (diff) | |
| parent | 8362d43dcdcc68cb7b8337930015b05caad31b34 (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
fs/afs/write.c
fs/cifs/dir.c
fs/ubifs/file.c
include/asm-generic/fcntl.h
net/compat.c
net/socket.c
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 b7f4a1f94d48..1963debee646 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -293,7 +293,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) else ret = do_sync_read(file, buf, count, pos); if (ret > 0) { - fsnotify_access(file->f_path.dentry); + fsnotify_access(file); add_rchar(current, ret); } inc_syscr(current); @@ -348,7 +348,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ else ret = do_sync_write(file, buf, count, pos); if (ret > 0) { - fsnotify_modify(file->f_path.dentry); + fsnotify_modify(file); add_wchar(current, ret); } inc_syscw(current); @@ -656,9 +656,9 @@ out: kfree(iov); if ((ret + (type == READ)) > 0) { if (type == READ) - fsnotify_access(file->f_path.dentry); + fsnotify_access(file); else - fsnotify_modify(file->f_path.dentry); + fsnotify_modify(file); } return ret; } |