commit f538d0ba5be39c52addff01c7ec31f0b90e57dfc
author Trond Myklebust <trond.myklebust@primarydata.com> Mon May 16 14:41:14 2016 -0400
committer Anna Schumaker <Anna.Schumaker@Netapp.com> Tue May 17 15:48:05 2016 -0400
tree 63b6a1b35e3b21c998849000c410e10678614b05
parent 6e14a92c363e1f42c6e1339da8413fcfbe1bdc3a

pNFS: Fix a leaked layoutstats flag

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

fs/nfs/pnfs.c

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 5b404d9..faea982 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2407,7 +2407,7 @@
 	spin_lock(&inode->i_lock);
 	if (!NFS_I(inode)->layout) {
 		spin_unlock(&inode->i_lock);
-		goto out;
+		goto out_clear_layoutstats;
 	}
 	hdr = NFS_I(inode)->layout;
 	pnfs_get_layout_hdr(hdr);
@@ -2436,6 +2436,7 @@
 	kfree(data);
 out_put:
 	pnfs_put_layout_hdr(hdr);
+out_clear_layoutstats:
 	smp_mb__before_atomic();
 	clear_bit(NFS_INO_LAYOUTSTATS, &nfsi->flags);
 	smp_mb__after_atomic();