From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 5 Nov 2019 21:02:20 +0000 (-0500)
Subject: Merge branch 'jk/jbd2-revoke-overflow'
X-Git-Tag: v5.10.7~3582^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6d4040846bff49c7e870cee5693245f87f2cfce;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'jk/jbd2-revoke-overflow'
---

a6d4040846bff49c7e870cee5693245f87f2cfce
diff --cc fs/jbd2/transaction.c
index 7c11afe60532,a9d3a2208506..c068912408dd
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@@ -1665,15 -1737,20 +1736,15 @@@ int jbd2_journal_forget (handle_t *hand
  		__jbd2_journal_file_buffer(jh, transaction, BJ_Forget);
  		spin_unlock(&journal->j_list_lock);
  	}
 -
 -	jbd_unlock_bh_state(bh);
 -	__brelse(bh);
  drop:
 +	__brelse(bh);
 +	spin_unlock(&jh->b_state_lock);
 +	jbd2_journal_put_journal_head(jh);
  	if (drop_reserve) {
  		/* no need to reserve log space for this block -bzzz */
- 		handle->h_buffer_credits++;
+ 		handle->h_total_credits++;
  	}
  	return err;
 -
 -not_jbd:
 -	jbd_unlock_bh_state(bh);
 -	__bforget(bh);
 -	goto drop;
  }
  
  /**