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

Commit c618e87a authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Update to AIL list locking 



The previous patch missed a couple of places where the AIL list
needed locking, so this fixes up those places, plus a comment
is corrected too.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: Dave Chinner <dchinner@redhat.com>
parent d6a079e8

fs/gfs2/log.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ unsigned int gfs2_struct2blk(struct gfs2_sbd *sdp, unsigned int nstruct, 
 * @mapping: The associated mapping (maybe NULL)

 * @bd: The gfs2_bufdata to remove

 *

 * The log lock _must_ be held when calling this function

 * The ail lock _must_ be held when calling this function

 *

 */

fs/gfs2/lops.c

+2 −0
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ static void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh) 
	/* If this buffer is in the AIL and it has already been written

	 * to in-place disk block, remove it from the AIL.

	 */

	spin_lock(&sdp->sd_ail_lock);

	if (bd->bd_ail)

		list_move(&bd->bd_ail_st_list, &bd->bd_ail->ai_ail2_list);

	spin_unlock(&sdp->sd_ail_lock);

	get_bh(bh);

	atomic_inc(&sdp->sd_log_pinned);

	trace_gfs2_pin(bd, 1);

fs/gfs2/meta_io.c

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ void gfs2_remove_from_journal(struct buffer_head *bh, struct gfs2_trans *tr, int 
		brelse(bh);

	}

	if (bd) {

		spin_lock(&sdp->sd_ail_lock);

		if (bd->bd_ail) {

			gfs2_remove_from_ail(bd);

			bh->b_private = NULL;
@@ -333,6 +334,7 @@ void gfs2_remove_from_journal(struct buffer_head *bh, struct gfs2_trans *tr, int 
			bd->bd_blkno = bh->b_blocknr;

			gfs2_trans_add_revoke(sdp, bd);

		}

		spin_unlock(&sdp->sd_ail_lock);

	}

	clear_buffer_dirty(bh);

	clear_buffer_uptodate(bh);