Return-Path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:33092 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755063Ab0KOTcC (ORCPT ); Mon, 15 Nov 2010 14:32:02 -0500 Subject: [PATCH] nfs: Don't generate duplicated events To: "J. Bruce Fields" From: Alexey Zaytsev Cc: linux-nfs@vger.kernel.org, Neil Brown , linux-kernel@vger.kernel.org, Eric Paris , linux-fsdevel@vger.kernel.org, Robert Love Date: Mon, 15 Nov 2010 19:33:27 +0000 Message-ID: <20101115193021.3286.35208.stgit@zaytsev.su> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 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 --- 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 #include #include -#include #include #include #include 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 #include #include -#include #include #include #include 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 #include #include -#include #include #include #include @@ -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))