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

diff --cc fs/cachefiles/namei.c
Simple merge

diff --cc fs/nfsd/vfs.c
index 296d671654d6a12fbb89567ea6b80cfd26a1829f,5f30270ae644d7b64a870460fe2fb7378c23392c..bb537f0b736bd26bf351cae4d00e9adb4ddb75ba
--- 1/fs/nfsd/vfs.c
--- 2/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -941,9 -923,9 +940,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;
  }
  

diff --cc fs/notify/fanotify/fanotify_user.c
index 3568c8a8b1387aea2845d6998b2b7e6d1dc6dcb2,2d4925b98bdb53104863662db3babb4c79c66bdd..d68873123ca98b83cd33dd8a56b791e93a078881
--- 1/fs/notify/fanotify/fanotify_user.c
--- 2/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@@ -548,10 -554,13 +556,13 @@@ static int fanotify_remove_vfsmount_mar
  
        removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags);
        fsnotify_put_mark(fsn_mark);
 -      if (removed & mnt->mnt_fsnotify_mask)
 +      if (removed & real_mount(mnt)->mnt_fsnotify_mask)
                fsnotify_recalc_vfsmount_mask(mnt);
+       ret = 0;
+ err:
+       mutex_unlock(&group->mutex);
  
-       return 0;
+       return ret;
  }
  
  static int fanotify_remove_inode_mark(struct fsnotify_group *group,
@@@ -625,10 -644,13 +646,13 @@@ static int fanotify_add_vfsmount_mark(s
        }
        added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);
  
 -      if (added & ~mnt->mnt_fsnotify_mask)
 +      if (added & ~real_mount(mnt)->mnt_fsnotify_mask)
                fsnotify_recalc_vfsmount_mask(mnt);
- err:
+       ret = 0;
+ err2:
        fsnotify_put_mark(fsn_mark);
+ err:
+       mutex_unlock(&group->mutex);
        return ret;
  }
  

diff --cc fs/notify/group.c
Simple merge

diff --cc fs/notify/mark.c
Simple merge

diff --cc include/linux/fsnotify_backend.h
Simple merge