From d8759203ffeb2f740ac47c2653f66d98941a2d00 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 20 Nov 2012 15:16:30 -0500
Subject: [PATCH] --- yaml --- r: 346587 b: refs/heads/master c:
 ce008c4bb9766bc7eeb02e8299c8baadc25da90b h: refs/heads/master i:   346585:
 cb6329566f85a2cae760d6bd2689eaed1a1ed76a   346583:
 ccf2b7eeeeaa8d6fae2851d3ffd9fc69a41d72cf v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfs/callback_proc.c | 2 +-
 trunk/fs/nfs/nfs4_fs.h       | 2 ++
 trunk/fs/nfs/nfs4proc.c      | 8 ++++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 19f3ede1f549..99b131db042a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da0507b7c95ccd4d9c86394eef42fe076032af30
+refs/heads/master: ce008c4bb9766bc7eeb02e8299c8baadc25da90b
diff --git a/trunk/fs/nfs/callback_proc.c b/trunk/fs/nfs/callback_proc.c
index 0ef047b7d28d..15b9879d6fbb 100644
--- a/trunk/fs/nfs/callback_proc.c
+++ b/trunk/fs/nfs/callback_proc.c
@@ -576,7 +576,7 @@ __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, void *dummy,
 	if (args->crsa_target_max_slots == fc_tbl->max_slots)
 		goto out;
 
-	fc_tbl->target_highest_slotid = args->crsa_target_max_slots;
+	nfs41_set_target_slotid(fc_tbl, args->crsa_target_max_slots);
 	nfs41_handle_recall_slot(cps->clp);
 out:
 	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
diff --git a/trunk/fs/nfs/nfs4_fs.h b/trunk/fs/nfs/nfs4_fs.h
index 42c58691fb41..5d4e82b10c3c 100644
--- a/trunk/fs/nfs/nfs4_fs.h
+++ b/trunk/fs/nfs/nfs4_fs.h
@@ -260,6 +260,8 @@ extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data,
 
 extern struct nfs4_slot *nfs4_alloc_slots(struct nfs4_slot_table *table,
 		u32 max_slots, gfp_t gfp_flags);
+extern void nfs41_set_target_slotid(struct nfs4_slot_table *tbl,
+		u32 target_highest_slotid);
 
 static inline bool
 is_ds_only_client(struct nfs_client *clp)
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 52435ec44193..62212231ce62 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -498,6 +498,14 @@ static void nfs41_set_target_slotid_locked(struct nfs4_slot_table *tbl,
 	tbl->generation++;
 }
 
+void nfs41_set_target_slotid(struct nfs4_slot_table *tbl,
+		u32 target_highest_slotid)
+{
+	spin_lock(&tbl->slot_tbl_lock);
+	nfs41_set_target_slotid_locked(tbl, target_highest_slotid);
+	spin_unlock(&tbl->slot_tbl_lock);
+}
+
 static void nfs41_set_server_slotid_locked(struct nfs4_slot_table *tbl,
 		u32 highest_slotid)
 {