From fa6bcefb86ef7cb348c5894ba283aa05793ee0d6 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 21 Sep 2012 15:49:42 -0400
Subject: [PATCH] --- yaml --- r: 333149 b: refs/heads/master c:
 173f77e9c5cbddb02eebe17dd9c48d39e5eb86b9 h: refs/heads/master i:   333147:
 338e2ffce877812c085ffa5679a3258784e71f8c v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfs/pnfs.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17d757ff3735..333ffe507156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8006bfba36d42b6976ed92979f51e5f9bef2625c
+refs/heads/master: 173f77e9c5cbddb02eebe17dd9c48d39e5eb86b9
diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c
index bda88a275071..174c51a5001c 100644
--- a/trunk/fs/nfs/pnfs.c
+++ b/trunk/fs/nfs/pnfs.c
@@ -331,6 +331,8 @@ pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,
 	list_del_init(&lseg->pls_list);
 	/* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */
 	atomic_dec(&lo->plh_refcount);
+	if (list_empty(&lo->plh_segs))
+		clear_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);
 	rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq);
 }