From: Benny Halevy <benny@tonian.com>
Date: Wed, 15 Jun 2011 15:39:57 +0000 (-0400)
Subject: NFSv4.1: need to put_layout_hdr on _pnfs_return_layout error path
X-Git-Tag: firefly_0821_release~3680^2~5205^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ed3a8539af7b36aa5c977f304e80f7fc8d27bfc;p=firefly-linux-kernel-4.4.55.git

NFSv4.1: need to put_layout_hdr on _pnfs_return_layout error path

We always get a reference on the layout header and we rely on
nfs4_layoutreturn_release to put it.  If we hit an allocation error
before starting the rpc proc we bail out early without dereferncing
the layout header properly.

Signed-off-by: Benny Halevy <benny@tonian.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index d066aad608ad..8f9582281252 100644
--- a/fs/nfs/pnfs.c
+++ b/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;
 	}