From c2f45f307d92048dbe9da36498063da1bd4513a3 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 24 Sep 2012 13:49:27 -0400
Subject: [PATCH] --- yaml --- r: 333151 b: refs/heads/master c:
 65857d5768f7716da539933c2075d384b117812d h: refs/heads/master i:   333149:
 fa6bcefb86ef7cb348c5894ba283aa05793ee0d6   333147:
 338e2ffce877812c085ffa5679a3258784e71f8c   333143:
 97df73fe86b49b0496430506bda1930be55ecc65   333135:
 7b9bf760fa7692d33d4562d22af0baf497be94fd   333119:
 c41828c1cc55d81f41a6b7d75ab97ebc1911ffe3 v: v3

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

diff --git a/[refs] b/[refs]
index 173c06fd8b0a..344ebae7b18c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5929f3cff05e84f20c68df235f4768920e2e89e
+refs/heads/master: 65857d5768f7716da539933c2075d384b117812d
diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c
index 20a1b6222ff6..d737557747b9 100644
--- a/trunk/fs/nfs/pnfs.c
+++ b/trunk/fs/nfs/pnfs.c
@@ -718,8 +718,9 @@ _pnfs_return_layout(struct inode *ino)
 	lrp = kzalloc(sizeof(*lrp), GFP_KERNEL);
 	if (unlikely(lrp == NULL)) {
 		status = -ENOMEM;
-		pnfs_layout_io_set_failed(lo, IOMODE_RW);
-		pnfs_layout_io_set_failed(lo, IOMODE_READ);
+		spin_lock(&ino->i_lock);
+		lo->plh_block_lgets--;
+		spin_unlock(&ino->i_lock);
 		pnfs_put_layout_hdr(lo);
 		goto out;
 	}