Skip to contentSkip to conversation

nfs: Don't generate duplicated events

PATCH Applied Alexey Zaytsev 2 participants 2 messages Nov 15, 2010 – Nov 23, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs: Don't generate duplicated events

The events are already generated by vfs_readv and vfs_writev. splice does not seem to generate the events, but that's an other bug.

The patch also removes a couple of unneeded fsnotify.h inclusions from fs/cachefiles/.

---
 fs/cachefiles/namei.c |    1 -
 fs/cachefiles/xattr.c |    1 -
 fs/nfsd/vfs.c         |    3 ---
 3 files changed, 0 insertions(+), 5 deletions(-)
fs/cachefiles/namei.c +0 -1
index 42c7faf..e33b9a0 100644
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/fsnotify.h>
 #include <linux/quotaops.h>
 #include <linux/xattr.h>
 #include <linux/mount.h>
fs/cachefiles/xattr.c +0 -1
index e18b183..6e05068 100644
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/fsnotify.h>
 #include <linux/quotaops.h>
 #include <linux/xattr.h>
 #include <linux/slab.h>
fs/nfsd/vfs.c +0 -3
index 184938f..5f30270 100644
@@ -20,7 +20,6 @@
 #include <linux/fcntl.h>
 #include <linux/namei.h>
 #include <linux/delay.h>
-#include <linux/fsnotify.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
 #include <linux/jhash.h>
@@ -924,7 +923,6 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 		nfsdstats.io_read += host_err;
 		*count = host_err;
 		err = 0;
-		fsnotify_access(file);
 	} else 
 		err = nfserrno(host_err);
 out:
@@ -1035,7 +1033,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 		goto out_nfserr;
 	*cnt = host_err;
 	nfsdstats.io_write += host_err;
-	fsnotify_modify(file);
 
 	/* clear setuid/setgid flag after write */
 	if (inode->i_mode & (S_ISUID | S_ISGID))
Applied
#1 lore raw
Quoted 8 lines · Alexey Zaytsev

The events are already generated by vfs_readv and vfs_writev. splice does not seem to generate the events, but that's an other bug.

The patch also removes a couple of unneeded fsnotify.h inclusions from fs/cachefiles/.

applied. thanks.

Quoted 52 lines
---
 fs/cachefiles/namei.c |    1 -
 fs/cachefiles/xattr.c |    1 -
 fs/nfsd/vfs.c         |    3 ---
 3 files changed, 0 insertions(+), 5 deletions(-)
fs/cachefiles/namei.c +0 -1
index 42c7faf..e33b9a0 100644
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/fsnotify.h>
 #include <linux/quotaops.h>
 #include <linux/xattr.h>
 #include <linux/mount.h>
fs/cachefiles/xattr.c +0 -1
index e18b183..6e05068 100644
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/fsnotify.h>
 #include <linux/quotaops.h>
 #include <linux/xattr.h>
 #include <linux/slab.h>
fs/nfsd/vfs.c +0 -2
index 184938f..5f30270 100644
@@ -20,7 +20,6 @@
 #include <linux/fcntl.h>
 #include <linux/namei.h>
 #include <linux/delay.h>
-#include <linux/fsnotify.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
 #include <linux/jhash.h>
@@ -924,7 +923,6 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 		nfsdstats.io_read += host_err;
 		*count = host_err;
 		err = 0;
-		fsnotify_access(file);
 	} else 
 		err = nfserrno(host_err);
 out:

fs/nfsd/vfs.c nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, · line 1038

Quoted 7 lines
fs/nfsd/vfs.c +0 -1
@@ -1035,7 +1033,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 		goto out_nfserr;
 	*cnt = host_err;
 	nfsdstats.io_write += host_err;
-	fsnotify_modify(file);
 
 	/* clear setuid/setgid flag after write */
 	if (inode->i_mode & (S_ISUID | S_ISGID))

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html