Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull third set of VFS updates from Al Viro:
 "Misc stuff all over the place.  There will be one more pile in a
  couple of days"

This is an "evil merge" that also uses the new d_count helper in
fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading
->d_count")

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ncpfs: fix error return code in ncp_parse_options()
  locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock
  seq_file: add seq_list_*_percpu helpers
  f2fs: fix readdir incorrectness
  mode_t whack-a-mole...
  lustre: kill the pointless wrapper
  helper for reading ->d_count

diff --cc fs/configfs/dir.c
index 64e5323,64e5323..5e7c60c
--- 1/fs/configfs/dir.c
--- 2/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@@ -387,7 -387,7 +387,7 @@@ static void remove_dir(struct dentry * 
        if (d->d_inode)
                simple_rmdir(parent->d_inode,d);
  
--      pr_debug(" o %s removing done (%d)\n",d->d_name.name, d->d_count);
++      pr_debug(" o %s removing done (%d)\n",d->d_name.name, d_count(d));
  
        dput(parent);
  }