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/compat.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/compat.c')
| -rw-r--r-- | fs/compat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/compat.c b/fs/compat.c index 00d90c2e66f0..ecc343812595 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1168,11 +1168,10 @@ out: if (iov != iovstack) kfree(iov); if ((ret + (type == READ)) > 0) { - struct dentry *dentry = file->f_path.dentry; if (type == READ) - fsnotify_access(dentry); + fsnotify_access(file); else - fsnotify_modify(dentry); + fsnotify_modify(file); } return ret; } |