---

yaml --- r: 253937 b: refs/heads/master c: ea0ded7 h: refs/heads/master i: 253935: bfd9463 v: v3
git-mirror · Jun 15, 2011 · f0306cd · f0306cd
1 parent 1eed0c2
commit f0306cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ed3a8539af7b36aa5c977f304e80f7fc8d27bfc
+refs/heads/master: ea0ded748bdea78f9e2fefb571f7d6ce9edb4f89
diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c
@@ -640,10 +640,10 @@ _pnfs_return_layout(struct inode *ino)
 		return status;
 	}
 	stateid = nfsi->layout->plh_stateid;
-	mark_matching_lsegs_invalid(lo, &tmp_list, NULL);
-	lo->plh_block_lgets++;
 	/* Reference matched in nfs4_layoutreturn_release */
 	get_layout_hdr(lo);
+	mark_matching_lsegs_invalid(lo, &tmp_list, NULL);
+	lo->plh_block_lgets++;
 	spin_unlock(&ino->i_lock);
 	pnfs_free_lseg_list(&tmp_list);