From: Stephen Rothwell Date: Wed, 10 Aug 2011 01:06:24 +0000 (+1000) Subject: Merge remote-tracking branch 'fsnotify/for-next' X-Git-Tag: next-20110810~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4bbc00ad0403e90422cedf7d6e1641fc3303c106;p=karo-tx-linux.git Merge remote-tracking branch 'fsnotify/for-next' --- 4bbc00ad0403e90422cedf7d6e1641fc3303c106 diff --cc fs/nfsd/vfs.c index fd0acca5370a,5f30270ae644..9c7ef668f6b1 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@@ -904,9 -923,9 +903,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; }