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

Commit 722f6f62 authored by Bob Peterson's avatar Bob Peterson
Browse files

GFS2: Eliminate vestigial sd_log_flush_wrapped 



Superblock variable sd_log_flush_wrapped is set, but never referenced,
so this patch eliminates it.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent df68f20f

fs/gfs2/incore.h

+0 −1
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ struct gfs2_sbd { 
	wait_queue_head_t sd_reserving_log_wait;



	unsigned int sd_log_flush_head;

	u64 sd_log_flush_wrapped;



	spinlock_t sd_ail_lock;

	struct list_head sd_ail1_list;

fs/gfs2/log.c

+0 −3
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, 
		clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);



	sdp->sd_log_flush_head = sdp->sd_log_head;

	sdp->sd_log_flush_wrapped = 0;

	tr = sdp->sd_log_tr;

	if (tr) {

		sdp->sd_log_tr = NULL;
@@ -775,7 +774,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, 
			}

			atomic_dec(&sdp->sd_log_blks_free); /* Adjust for unreserved buffer */

			trace_gfs2_log_blocks(sdp, -1);

			sdp->sd_log_flush_wrapped = 0;

			log_write_header(sdp, 0);

			sdp->sd_log_head = sdp->sd_log_flush_head;

		}
@@ -880,7 +878,6 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp) 
	gfs2_assert_withdraw(sdp, list_empty(&sdp->sd_ail1_list));



	sdp->sd_log_flush_head = sdp->sd_log_head;

	sdp->sd_log_flush_wrapped = 0;



	log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT);

fs/gfs2/lops.c

+1 −3
Original line number Diff line number Diff line
@@ -134,10 +134,8 @@ static void gfs2_log_incr_head(struct gfs2_sbd *sdp) 
	BUG_ON((sdp->sd_log_flush_head == sdp->sd_log_tail) &&

	       (sdp->sd_log_flush_head != sdp->sd_log_head));



	if (++sdp->sd_log_flush_head == sdp->sd_jdesc->jd_blocks) {

	if (++sdp->sd_log_flush_head == sdp->sd_jdesc->jd_blocks)

		sdp->sd_log_flush_head = 0;

		sdp->sd_log_flush_wrapped = 1;

	}

}



static u64 gfs2_log_bmap(struct gfs2_sbd *sdp)