Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f538d0ba authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

pNFS: Fix a leaked layoutstats flag 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6e14a92c

fs/nfs/pnfs.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2407,7 +2407,7 @@ pnfs_report_layoutstat(struct inode *inode, gfp_t gfp_flags) 
	spin_lock(&inode->i_lock);

	spin_lock(&inode->i_lock);

	if (!NFS_I(inode)->layout) {

	if (!NFS_I(inode)->layout) {

		spin_unlock(&inode->i_lock);

		spin_unlock(&inode->i_lock);

		goto out;

		goto out_clear_layoutstats;

	}

	}

	hdr = NFS_I(inode)->layout;

	hdr = NFS_I(inode)->layout;

	pnfs_get_layout_hdr(hdr);

	pnfs_get_layout_hdr(hdr);
@@ -2436,6 +2436,7 @@ pnfs_report_layoutstat(struct inode *inode, gfp_t gfp_flags) 
	kfree(data);

	kfree(data);

out_put:

out_put:

	pnfs_put_layout_hdr(hdr);

	pnfs_put_layout_hdr(hdr);

out_clear_layoutstats:

	smp_mb__before_atomic();

	smp_mb__before_atomic();

	clear_bit(NFS_INO_LAYOUTSTATS, &nfsi->flags);

	clear_bit(NFS_INO_LAYOUTSTATS, &nfsi->flags);

	smp_mb__after_atomic();

	smp_mb__after_atomic();