---

yaml --- r: 333149 b: refs/heads/master c: 173f77e h: refs/heads/master i: 333147: 338e2ff v: v3
git-mirror · Sep 28, 2012 · fa6bcef · fa6bcef
1 parent e76a550
commit fa6bcef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 }