---

yaml --- r: 253938 b: refs/heads/master c: 9e2dfdb h: refs/heads/master v: v3
git-mirror · Jun 15, 2011 · 94c7694 · 94c7694
1 parent f0306cd
commit 94c7694
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: ea0ded748bdea78f9e2fefb571f7d6ce9edb4f89
+refs/heads/master: 9e2dfdb3081edfae66a49013517e80dd8a0469fa
diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c
@@ -652,6 +652,8 @@ _pnfs_return_layout(struct inode *ino)
 	lrp = kzalloc(sizeof(*lrp), GFP_KERNEL);
 	if (unlikely(lrp == NULL)) {
 		status = -ENOMEM;
+		set_bit(NFS_LAYOUT_RW_FAILED, &lo->plh_flags);
+		set_bit(NFS_LAYOUT_RO_FAILED, &lo->plh_flags);
 		put_layout_hdr(lo);
 		goto out;
 	}