[pnfs] Resend: [PATCH] nfs4_pnfs_return_layout: put nfs4_file only if not null

[Benny Halevy]

-------- Original Message --------
Subject: [PATCH] nfs4_pnfs_return_layout: put nfs4_file only if not null
Date: Mon,  9 Jul 2007 16:02:41 +0300
From: Benny Halevy <bhalevy at panasas.com>
To: pnfs at linux-pnfs.org
CC: Benny Halevy <bhalevy at panasas.com>

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfsd/nfs4state.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e8170b9..b879b2f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4534,7 +4534,8 @@ int nfs4_pnfs_return_layout(struct super_block *sb, struct svc_fh *current_fh,
 	}
 
 out:
-	put_nfs4_file(fp);
+	if (fp)
+		put_nfs4_file(fp);
 	nfs4_unlock_state();
 	dprintk("pNFS %s: exit status %d \n", __FUNCTION__, status);
 	return status;
-- 
1.5.2.86.g99b5