From 1eed0c218f6b8d06d03716050cdb15ecee1ebc32 Mon Sep 17 00:00:00 2001
From: Benny Halevy <benny@tonian.com>
Date: Wed, 15 Jun 2011 11:39:57 -0400
Subject: [PATCH] --- yaml --- r: 253936 b: refs/heads/master c:
 1ed3a8539af7b36aa5c977f304e80f7fc8d27bfc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6e0e907ffe79..ad6dd760ccaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7fd06228b994190d8369a2a0acf5224e4e13d1a
+refs/heads/master: 1ed3a8539af7b36aa5c977f304e80f7fc8d27bfc
diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c
index d066aad608ad..8f9582281252 100644
--- a/trunk/fs/nfs/pnfs.c
+++ b/trunk/fs/nfs/pnfs.c
@@ -652,6 +652,7 @@ _pnfs_return_layout(struct inode *ino)
 	lrp = kzalloc(sizeof(*lrp), GFP_KERNEL);
 	if (unlikely(lrp == NULL)) {
 		status = -ENOMEM;
+		put_layout_hdr(lo);
 		goto out;
 	}