[PATCH] nfs: Don't generate duplicated events

[PATCH] nfs: Don't generate duplicated events

[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/.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
---
 fs/cachefiles/namei.c |    1 -
 fs/cachefiles/xattr.c |    1 -
 fs/nfsd/vfs.c         |    3 ---
 3 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 42c7faf..e33b9a0 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -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>
diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
index e18b183..6e05068 100644
--- a/fs/cachefiles/xattr.c
+++ b/fs/cachefiles/xattr.c
@@ -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>
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 184938f..5f30270 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -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))

Re: [PATCH] nfs: Don't generate duplicated events

[Eric Paris]

On Mon, 2010-11-15 at 19:33 +0000, Alexey Zaytsev wrote:
> 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/.
> 
> Signed-off-by: Alexey Zaytsev <alexey.zaytsev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

applied.  thanks.

> ---
>  fs/cachefiles/namei.c |    1 -
>  fs/cachefiles/xattr.c |    1 -
>  fs/nfsd/vfs.c         |    3 ---
>  3 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
> index 42c7faf..e33b9a0 100644
> --- a/fs/cachefiles/namei.c
> +++ b/fs/cachefiles/namei.c
> @@ -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>
> diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
> index e18b183..6e05068 100644
> --- a/fs/cachefiles/xattr.c
> +++ b/fs/cachefiles/xattr.c
> @@ -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>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 184938f..5f30270 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -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))
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html