Commit 5a15907f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Get rid of gfs2_log_[un]lock helpers 



These two helpers only hide the locking operation; they do not make
the code more readable.

Created with:

sed -i -e 's:gfs2_log_unlock(sdp):spin_unlock(\&sdp->sd_log_lock):' \
       -e 's:gfs2_log_lock(sdp):spin_lock(\&sdp->sd_log_lock):'

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 7288185c

fs/gfs2/aops.c

+5 −5
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh) 
	struct gfs2_bufdata *bd;



	lock_buffer(bh);

	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	clear_buffer_dirty(bh);

	bd = bh->b_private;

	if (bd) {
@@ -599,7 +599,7 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh) 
	clear_buffer_mapped(bh);

	clear_buffer_req(bh);

	clear_buffer_new(bh);

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

	unlock_buffer(bh);

}
@@ -667,7 +667,7 @@ bool gfs2_release_folio(struct folio *folio, gfp_t gfp_mask) 
	 * again.

	 */



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	bh = head;

	do {

		if (atomic_read(&bh->b_count))
@@ -699,12 +699,12 @@ bool gfs2_release_folio(struct folio *folio, gfp_t gfp_mask) 


		bh = bh->b_this_page;

	} while (bh != head);

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);



	return try_to_free_buffers(folio);



cannot_release:

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

	return false;

}

fs/gfs2/glops.c

+4 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync, 
	struct buffer_head *bh;

	const unsigned long b_state = (1UL << BH_Dirty)|(1UL << BH_Pinned)|(1UL << BH_Lock);



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	spin_lock(&sdp->sd_ail_lock);

	list_for_each_entry_safe_reverse(bd, tmp, head, bd_ail_gl_list) {

		if (nr_revokes == 0)
@@ -80,7 +80,7 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync, 
	}

	GLOCK_BUG_ON(gl, !fsync && atomic_read(&gl->gl_ail_count));

	spin_unlock(&sdp->sd_ail_lock);

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

}
@@ -109,10 +109,10 @@ static int gfs2_ail_empty_gl(struct gfs2_glock *gl) 
		 * If none of these conditions are true, our revokes are all

		 * flushed and we can return.

		 */

		gfs2_log_lock(sdp);

		spin_lock(&sdp->sd_log_lock);

		have_revokes = !list_empty(&sdp->sd_log_revokes);

		log_in_flight = atomic_read(&sdp->sd_log_in_flight);

		gfs2_log_unlock(sdp);

		spin_unlock(&sdp->sd_log_lock);

		if (have_revokes)

			goto flush;

		if (log_in_flight)

fs/gfs2/log.c

+6 −6
Original line number Diff line number Diff line
@@ -800,9 +800,9 @@ void gfs2_flush_revokes(struct gfs2_sbd *sdp) 
	/* number of revokes we still have room for */

	unsigned int max_revokes = atomic_read(&sdp->sd_log_revokes_available);



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	gfs2_ail1_empty(sdp, max_revokes);

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

}



/**
@@ -1110,7 +1110,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 
		goto out_withdraw;

	lops_after_commit(sdp, tr);



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	sdp->sd_log_blks_reserved = 0;



	spin_lock(&sdp->sd_ail_lock);
@@ -1119,7 +1119,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 
		tr = NULL;

	}

	spin_unlock(&sdp->sd_ail_lock);

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);



	if (!(flags & GFS2_LOG_HEAD_FLUSH_NORMAL)) {

		if (!sdp->sd_log_idle) {
@@ -1200,7 +1200,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
	unsigned int unused;

	unsigned int maxres;



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);



	if (sdp->sd_log_tr) {

		gfs2_merge_trans(sdp, tr);
@@ -1218,7 +1218,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
		gfs2_log_release(sdp, unused);

	sdp->sd_log_blks_reserved = reserved;



	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

}



static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)

fs/gfs2/log.h

+0 −24
Original line number Diff line number Diff line
@@ -20,30 +20,6 @@ 
 */

#define GFS2_LOG_FLUSH_MIN_BLOCKS 4



/**

 * gfs2_log_lock - acquire the right to mess with the log manager

 * @sdp: the filesystem

 *

 */



static inline void gfs2_log_lock(struct gfs2_sbd *sdp)

__acquires(&sdp->sd_log_lock)

{

	spin_lock(&sdp->sd_log_lock);

}



/**

 * gfs2_log_unlock - release the right to mess with the log manager

 * @sdp: the filesystem

 *

 */



static inline void gfs2_log_unlock(struct gfs2_sbd *sdp)

__releases(&sdp->sd_log_lock)

{

	spin_unlock(&sdp->sd_log_lock);

}



static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

fs/gfs2/lops.c

+8 −8
Original line number Diff line number Diff line
@@ -648,19 +648,19 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
	unsigned n;

	__be64 *ptr;



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_log_lock);

	list_sort(NULL, blist, blocknr_cmp);

	bd1 = bd2 = list_prepare_entry(bd1, blist, bd_list);

	while(total) {

		num = total;

		if (total > limit)

			num = limit;

		gfs2_log_unlock(sdp);

		spin_unlock(&sdp->sd_log_lock);

		page = gfs2_get_log_desc(sdp,

					 is_databuf ? GFS2_LOG_DESC_JDATA :

					 GFS2_LOG_DESC_METADATA, num + 1, num);

		ld = page_address(page);

		gfs2_log_lock(sdp);

		spin_lock(&sdp->sd_log_lock);

		ptr = (__be64 *)(ld + 1);



		n = 0;
@@ -674,14 +674,14 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
				break;

		}



		gfs2_log_unlock(sdp);

		spin_unlock(&sdp->sd_log_lock);

		gfs2_log_write_page(sdp, page);

		gfs2_log_lock(sdp);

		spin_lock(&sdp->sd_log_lock);



		n = 0;

		list_for_each_entry_continue(bd2, blist, bd_list) {

			get_bh(bd2->bd_bh);

			gfs2_log_unlock(sdp);

			spin_unlock(&sdp->sd_log_lock);

			lock_buffer(bd2->bd_bh);



			if (buffer_escaped(bd2->bd_bh)) {
@@ -698,7 +698,7 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
			} else {

				gfs2_log_write_bh(sdp, bd2->bd_bh);

			}

			gfs2_log_lock(sdp);

			spin_lock(&sdp->sd_log_lock);

			if (++n >= num)

				break;

		}
@@ -706,7 +706,7 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, 
		BUG_ON(total < num);

		total -= num;

	}

	gfs2_log_unlock(sdp);

	spin_unlock(&sdp->sd_log_lock);

}



static void buf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)