p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps 

In function sweep_bh_for_rgrps, which is a helper for punch_hole,
it uses variable buf_in_tr to keep track of when it needs to commit
pending block frees on a partial delete that overflows the
transaction created for the delete. The problem is that the
variable was initialized at the start of function sweep_bh_for_rgrps
but it was never cleared, even when starting a new transaction.

This patch reinitializes the variable when the transaction is
ended, so the next transaction starts out with it cleared.

Fixes: d552a2b9b3 ("GFS2: Non-recursive delete")
Cc: stable@vger.kernel.org # v4.12+
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
Bob Peterson 2019-09-12 13:54:27 -04:00 committed by Andreas Gruenbacher
parent b473bc2dcd
commit f0b444b349
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/gfs2/bmap.c
View File

@ -1632,6 +1632,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh,
brelse(dibh); brelse(dibh);
up_write(&ip->i_rw_mutex); up_write(&ip->i_rw_mutex);
gfs2_trans_end(sdp); gfs2_trans_end(sdp);
buf_in_tr = false;
} }
gfs2_glock_dq_uninit(rd_gh); gfs2_glock_dq_uninit(rd_gh);
cond_resched(); cond_resched();