From 85e537711b05e4e2c35f84b62237680494fe9769 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Mon, 2 Jan 2012 17:30:05 -0500
Subject: [PATCH] --- yaml --- r: 284645 b: refs/heads/master c:
 aec39680b02ed55fcbb2bc87ad96eba16a651546 h: refs/heads/master i:   284643:
 cf0ab638e03097a6d49e18bb3ae4ae25ca69fd30 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfsd/nfs4recover.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d8165a45b286..ce535c5361f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d3475c0ad625f7a43844a6cd0130d136416e604
+refs/heads/master: aec39680b02ed55fcbb2bc87ad96eba16a651546
diff --git a/trunk/fs/nfsd/nfs4recover.c b/trunk/fs/nfsd/nfs4recover.c
index ed083b9a731b..28712e20bb11 100644
--- a/trunk/fs/nfsd/nfs4recover.c
+++ b/trunk/fs/nfsd/nfs4recover.c
@@ -144,8 +144,15 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
 		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);
 	if (status)