From: Fred Isaman <iisaman@netapp.com>
Date: Wed, 15 Jun 2011 18:32:02 +0000 (-0400)
Subject: nfs4.1: mark layout as bad on error path in _pnfs_return_layout
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9e2dfdb3081edfae66a49013517e80dd8a0469fa;p=deliverable%2Flinux.git

nfs4.1: mark layout as bad on error path in _pnfs_return_layout

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 730d4dbbaf68..539b94cb6c0f 100644
--- a/fs/nfs/pnfs.c
+++ b/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;
 	}