From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Dec 2011 04:20:04 +0000 (+1100)
Subject: Merge remote-tracking branch 'fsnotify/for-next'
X-Git-Tag: next-20111219~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8153750c9a37740d95456e2a3b9ee8bca7d8fb6b;p=karo-tx-linux.git

Merge remote-tracking branch 'fsnotify/for-next'
---

8153750c9a37740d95456e2a3b9ee8bca7d8fb6b
diff --cc fs/nfsd/vfs.c
index 7a2e442623c8,5f30270ae644..66cb3b0b97c1
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -922,9 -923,9 +921,8 @@@ nfsd_vfs_read(struct svc_rqst *rqstp, s
  		nfsdstats.io_read += host_err;
  		*count = host_err;
  		err = 0;
- 		fsnotify_access(file);
  	} else 
  		err = nfserrno(host_err);
 -out:
  	return err;
  }