From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Mar 2013 21:23:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=56a79b7b021bf1b08334e63c2c14b280e2dbf47a;p=~shefty%2Frdma-dev.git

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

Pull  more VFS bits from Al Viro:
 "Unfortunately, it looks like xattr series will have to wait until the
  next cycle ;-/

  This pile contains 9p cleanups and fixes (races in v9fs_fid_add()
  etc), fixup for nommu breakage in shmem.c, several cleanups and a bit
  more file_inode() work"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  constify path_get/path_put and fs_struct.c stuff
  fix nommu breakage in shmem.c
  cache the value of file_inode() in struct file
  9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry
  9p: make sure ->lookup() adds fid to the right dentry
  9p: untangle ->lookup() a bit
  9p: double iput() in ->lookup() if d_materialise_unique() fails
  9p: v9fs_fid_add() can't fail now
  v9fs: get rid of v9fs_dentry
  9p: turn fid->dlist into hlist
  9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine
  more file_inode() open-coded instances
  selinux: opened file can't have NULL or negative ->f_path.dentry

(In the meantime, the hlist traversal macros have changed, so this
required a semantic conflict fixup for the newly hlistified fid->dlist)
---

56a79b7b021bf1b08334e63c2c14b280e2dbf47a
diff --cc fs/9p/fid.c
index afd4724b2d9,616abaf1c6c..d51ec9fafcc
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@@ -82,11 -68,13 +68,12 @@@ static struct p9_fid *v9fs_fid_find(str
  	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",
  		 dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid),
  		 any);
- 	dent = (struct v9fs_dentry *) dentry->d_fsdata;
  	ret = NULL;
- 	if (dent) {
- 		spin_lock(&dent->lock);
- 		list_for_each_entry(fid, &dent->fidlist, dlist) {
+ 	/* we'll recheck under lock if there's anything to look in */
+ 	if (dentry->d_fsdata) {
+ 		struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;
 -		struct hlist_node *n;
+ 		spin_lock(&dentry->d_lock);
 -		hlist_for_each_entry(fid, n, h, dlist) {
++		hlist_for_each_entry(fid, h, dlist) {
  			if (any || uid_eq(fid->uid, uid)) {
  				ret = fid;
  				break;