From f0306cdddbd8586a2ddba314ef68d3ebe1dca499 Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Wed, 15 Jun 2011 12:31:02 -0400
Subject: [PATCH] --- yaml --- r: 253937 b: refs/heads/master c:
 ea0ded748bdea78f9e2fefb571f7d6ce9edb4f89 h: refs/heads/master i:   253935:
 bfd94632eecc5325f1775371fae8f3951714c29b v: v3

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

diff --git a/[refs] b/[refs]
index ad6dd760ccaf..b2661a5744ef 100644
--- 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
index 8f9582281252..730d4dbbaf68 100644
--- 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);