---

yaml --- r: 333151 b: refs/heads/master c: 65857d5 h: refs/heads/master i: 333149: fa6bcef 333147: 338e2ff 333143: 97df73f 333135: 7b9bf76 333119: c41828c v: v3
git-mirror · Sep 28, 2012 · c2f45f3 · c2f45f3
1 parent 85dc2b4
commit c2f45f3
Show file tree

Hide file tree

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