diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:39:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:39:13 -0400 |
| commit | 8c8946f509a494769a8c602b5ed189df01917d39 (patch) | |
| tree | dfd96bd6ca5ea6803c6d77f65ba37e04f78b2d3b /fs/nfsd | |
| parent | 5f248c9c251c60af3403902b26e08de43964ea0b (diff) | |
| parent | 1968f5eed54ce47bde488fd9a450912e4a2d7138 (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
fanotify: use both marks when possible
fsnotify: pass both the vfsmount mark and inode mark
fsnotify: walk the inode and vfsmount lists simultaneously
fsnotify: rework ignored mark flushing
fsnotify: remove global fsnotify groups lists
fsnotify: remove group->mask
fsnotify: remove the global masks
fsnotify: cleanup should_send_event
fanotify: use the mark in handler functions
audit: use the mark in handler functions
dnotify: use the mark in handler functions
inotify: use the mark in handler functions
fsnotify: send fsnotify_mark to groups in event handling functions
fsnotify: Exchange list heads instead of moving elements
fsnotify: srcu to protect read side of inode and vfsmount locks
fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
fsnotify: use _rcu functions for mark list traversal
fsnotify: place marks on object in order of group memory address
vfs/fsnotify: fsnotify_close can delay the final work in fput
fsnotify: store struct file not struct path
...
Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.
Diffstat (limited to 'fs/nfsd')
| -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 8812f6b93969..96360a83cb91 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -934,7 +934,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 934 | nfsdstats.io_read += host_err; | 934 | nfsdstats.io_read += host_err; |
| 935 | *count = host_err; | 935 | *count = host_err; |
| 936 | err = 0; | 936 | err = 0; |
| 937 | fsnotify_access(file->f_path.dentry); | 937 | fsnotify_access(file); |
| 938 | } else | 938 | } else |
| 939 | err = nfserrno(host_err); | 939 | err = nfserrno(host_err); |
| 940 | out: | 940 | out: |
| @@ -1045,7 +1045,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 1045 | goto out_nfserr; | 1045 | goto out_nfserr; |
| 1046 | *cnt = host_err; | 1046 | *cnt = host_err; |
| 1047 | nfsdstats.io_write += host_err; | 1047 | nfsdstats.io_write += host_err; |
| 1048 | fsnotify_modify(file->f_path.dentry); | 1048 | fsnotify_modify(file); |
| 1049 | 1049 | ||
| 1050 | /* clear setuid/setgid flag after write */ | 1050 | /* clear setuid/setgid flag after write */ |
| 1051 | if (inode->i_mode & (S_ISUID | S_ISGID)) | 1051 | if (inode->i_mode & (S_ISUID | S_ISGID)) |