From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jul 2016 19:59:05 +0000 (-0700)
Subject: Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.8-rc1~125
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/6784725ab0b9473ce44bfad91a256bd72b5cddc1

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "Assorted cleanups and fixes.

  Probably the most interesting part long-term is ->d_init() - that will
  have a bunch of followups in (at least) ceph and lustre, but we'll
  need to sort the barrier-related rules before it can get used for
  really non-trivial stuff.

  Another fun thing is the merge of ->d_iput() callers (dentry_iput()
  and dentry_unlink_inode()) and a bunch of ->d_compare() ones (all
  except the one in __d_lookup_lru())"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  fs/dcache.c: avoid soft-lockup in dput()
  vfs: new d_init method
  vfs: Update lookup_dcache() comment
  bdev: get rid of ->bd_inodes
  Remove last traces of ->sync_page
  new helper: d_same_name()
  dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_depends()
  vfs: clean up documentation
  vfs: document ->d_real()
  vfs: merge .d_select_inode() into .d_real()
  unify dentry_iput() and dentry_unlink_inode()
  binfmt_misc: ->s_root is not going anywhere
  drop redundant ->owner initializations
  ufs: get rid of redundant checks
  orangefs: constify inode_operations
  missed comment updates from ->direct_IO() prototype change
  file_inode(f)->i_mapping is f->f_mapping
  trim fsnotify hooks a bit
  9p: new helper - v9fs_parent_fid()
  debugfs: ->d_parent is never NULL or negative
  ...
---

6784725ab0b9473ce44bfad91a256bd72b5cddc1
diff --cc fs/dcache.c
index 24bf27d66f6e,f650a4fc5b7c..b90cf8e09d5b
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@@ -2252,10 -2223,8 +2221,8 @@@ EXPORT_SYMBOL(d_lookup)
   */
  struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
  {
- 	unsigned int len = name->len;
  	unsigned int hash = name->hash;
- 	const unsigned char *str = name->name;
 -	struct hlist_bl_head *b = d_hash(parent, hash);
 +	struct hlist_bl_head *b = d_hash(hash);
  	struct hlist_bl_node *node;
  	struct dentry *found = NULL;
  	struct dentry *dentry;