From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 20:26:41 +0000 (-0800)
Subject: Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.3-rc1~67
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=0b48d42235caf627121f440b57d376f48a9af8b6

Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

* 'for-3.3' of git://linux-nfs.org/~bfields/linux: (31 commits)
  nfsd4: nfsd4_create_clid_dir return value is unused
  NFSD: Change name of extended attribute containing junction
  svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
  svcrpc: fix double-free on shutdown of nfsd after changing pool mode
  nfsd4: be forgiving in the absence of the recovery directory
  nfsd4: fix spurious 4.1 post-reboot failures
  NFSD: forget_delegations should use list_for_each_entry_safe
  NFSD: Only reinitilize the recall_lru list under the recall lock
  nfsd4: initialize special stateid's at compile time
  NFSd: use network-namespace-aware cache registering routines
  SUNRPC: create svc_xprt in proper network namespace
  svcrpc: update outdated BKL comment
  nfsd41: allow non-reclaim open-by-fh's in 4.1
  svcrpc: avoid memory-corruption on pool shutdown
  svcrpc: destroy server sockets all at once
  svcrpc: make svc_delete_xprt static
  nfsd: Fix oops when parsing a 0 length export
  nfsd4: Use kmemdup rather than duplicating its implementation
  nfsd4: add a separate (lockowner, inode) lookup
  nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error
  ...
---

0b48d42235caf627121f440b57d376f48a9af8b6
diff --cc fs/nfsd/nfs4recover.c
index 80a0be9ed00,a52f267f122..0b3e875d1ab
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@@ -144,10 -144,17 +144,17 @@@ void nfsd4_create_clid_dir(struct nfs4_
  		status = PTR_ERR(dentry);
  		goto out_unlock;
  	}
- 	status = -EEXIST;
  	if (dentry->d_inode)
+ 		/*
+ 		 * In the 4.1 case, where we're called from
+ 		 * reclaim_complete(), records from the previous reboot
+ 		 * may still be left, so this is OK.
+ 		 *
+ 		 * In the 4.0 case, we should never get here; but we may
+ 		 * as well be forgiving and just succeed silently.
+ 		 */
  		goto out_put;
 -	status = mnt_want_write(rec_file->f_path.mnt);
 +	status = mnt_want_write_file(rec_file);
  	if (status)
  		goto out_put;
  	status = vfs_mkdir(dir->d_inode, dentry, S_IRWXU);