[Cluster-devel] [PATCH AUTOSEL 4.19 10/19] gfs2: don't call quota_unhold if quotas are not locked

[Pavel Machek <pavel@ucw.cz>]

Hi!

> [ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ]
> 
> Before this patch, function gfs2_quota_unlock checked if quotas are
> turned off, and if so, it branched to label out, which called
> gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we
> no longer want to call gfs2_quota_unhold or we won't balance our
> gets and puts.

4.19 does not yet contain gfw2_qa_get; according to the changelog that
means that this patch is not suitable for 4.19 kernel.

Best regards,
								Pavel
								
> index dd0f9bc13164..ce47c8233612 100644
> --- a/fs/gfs2/quota.c
> +++ b/fs/gfs2/quota.c
> @@ -1116,7 +1116,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
>  	int found;
>  
>  	if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
> -		goto out;
> +		return;
>  
>  	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
>  		struct gfs2_quota_data *qd;
> @@ -1153,7 +1153,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
>  			qd_unlock(qda[x]);
>  	}
>  
> -out:
>  	gfs2_quota_unhold(ip);
>  }
>  

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20200531/d3a4b2d7/attachment.sig>