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/nfsd/vfs.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/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 3c111120b619..16114a8e79d4 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -951,7 +951,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
951 | nfsdstats.io_read += host_err; | 951 | nfsdstats.io_read += host_err; |
952 | *count = host_err; | 952 | *count = host_err; |
953 | err = 0; | 953 | err = 0; |
954 | fsnotify_access(file->f_path.dentry); | 954 | fsnotify_access(file); |
955 | } else | 955 | } else |
956 | err = nfserrno(host_err); | 956 | err = nfserrno(host_err); |
957 | out: | 957 | out: |
@@ -1062,7 +1062,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
1062 | goto out_nfserr; | 1062 | goto out_nfserr; |
1063 | *cnt = host_err; | 1063 | *cnt = host_err; |
1064 | nfsdstats.io_write += host_err; | 1064 | nfsdstats.io_write += host_err; |
1065 | fsnotify_modify(file->f_path.dentry); | 1065 | fsnotify_modify(file); |
1066 | 1066 | ||
1067 | /* clear setuid/setgid flag after write */ | 1067 | /* clear setuid/setgid flag after write */ |
1068 | if (inode->i_mode & (S_ISUID | S_ISGID)) | 1068 | if (inode->i_mode & (S_ISUID | S_ISGID)) |