leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gfs2: Fix incorrect variable name

Browse Source 
Rename sd_log_commited_revoke to sd_log_committed_revoke.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
Andreas Gruenbacher 2020-01-09 13:54:36 +01:00
parent 2b0fb353c0
commit 5d43975859
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/gfs2/incore.h
View File

@ -804,7 +804,7 @@ struct gfs2_sbd {
struct gfs2_trans *sd_log_tr; struct gfs2_trans *sd_log_tr;
unsigned int sd_log_blks_reserved; unsigned int sd_log_blks_reserved;
int sd_log_commited_revoke; int sd_log_committed_revoke;
atomic_t sd_log_pinned; atomic_t sd_log_pinned;
unsigned int sd_log_num_revoke; unsigned int sd_log_num_revoke;

10
fs/gfs2/log.c
View File

@ -469,8 +469,8 @@ static unsigned int calc_reserved(struct gfs2_sbd *sdp)
reserved += DIV_ROUND_UP(dbuf, databuf_limit(sdp)); reserved += DIV_ROUND_UP(dbuf, databuf_limit(sdp));
} }
if (sdp->sd_log_commited_revoke > 0) if (sdp->sd_log_committed_revoke > 0)
reserved += gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke); reserved += gfs2_struct2blk(sdp, sdp->sd_log_committed_revoke);
/* One for the overall header */ /* One for the overall header */
if (reserved) if (reserved)
reserved++; reserved++;
@ -825,7 +825,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)
if (unlikely(state == SFS_FROZEN)) if (unlikely(state == SFS_FROZEN))
gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke); gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);
gfs2_assert_withdraw(sdp, gfs2_assert_withdraw(sdp,
sdp->sd_log_num_revoke == sdp->sd_log_commited_revoke); sdp->sd_log_num_revoke == sdp->sd_log_committed_revoke);
gfs2_ordered_write(sdp); gfs2_ordered_write(sdp);
lops_before_commit(sdp, tr); lops_before_commit(sdp, tr);
@ -844,7 +844,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
sdp->sd_log_head = sdp->sd_log_flush_head; sdp->sd_log_head = sdp->sd_log_flush_head;
sdp->sd_log_blks_reserved = 0; sdp->sd_log_blks_reserved = 0;
sdp->sd_log_commited_revoke = 0; sdp->sd_log_committed_revoke = 0;
spin_lock(&sdp->sd_ail_lock); spin_lock(&sdp->sd_ail_lock);
if (tr && !list_empty(&tr->tr_ail1_list)) { if (tr && !list_empty(&tr->tr_ail1_list)) {
@ -916,7 +916,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
set_bit(TR_ATTACHED, &tr->tr_flags); set_bit(TR_ATTACHED, &tr->tr_flags);
} }
sdp->sd_log_commited_revoke += tr->tr_num_revoke; sdp->sd_log_committed_revoke += tr->tr_num_revoke;
reserved = calc_reserved(sdp); reserved = calc_reserved(sdp);
maxres = sdp->sd_log_blks_reserved + tr->tr_reserved; maxres = sdp->sd_log_blks_reserved + tr->tr_reserved;
gfs2_assert_withdraw(sdp, maxres >= reserved); gfs2_assert_withdraw(sdp, maxres >= reserved);