Commit b77b5fdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v5.12-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fixes from Andreas Gruenbacher:
 "Various gfs2 fixes"

* tag 'gfs2-v5.12-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: bypass log flush if the journal is not live
  gfs2: bypass signal_our_withdraw if no journal
  gfs2: fix use-after-free in trans_drain
  gfs2: make function gfs2_make_fs_ro() to void type
parents 17f8fc19 0efc4976

fs/gfs2/log.c

+5 −1
Original line number Diff line number Diff line
@@ -998,12 +998,16 @@ static void trans_drain(struct gfs2_trans *tr) 
	while (!list_empty(head)) {

		bd = list_first_entry(head, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);

		if (!list_empty(&bd->bd_ail_st_list))

			gfs2_remove_from_ail(bd);

		kmem_cache_free(gfs2_bufdata_cachep, bd);

	}

	head = &tr->tr_databuf;

	while (!list_empty(head)) {

		bd = list_first_entry(head, struct gfs2_bufdata, bd_list);

		list_del_init(&bd->bd_list);

		if (!list_empty(&bd->bd_ail_st_list))

			gfs2_remove_from_ail(bd);

		kmem_cache_free(gfs2_bufdata_cachep, bd);

	}

}
@@ -1032,7 +1036,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 
	 * Do this check while holding the log_flush_lock to prevent new

	 * buffers from being added to the ail via gfs2_pin()

	 */

	if (gfs2_withdrawn(sdp))

	if (gfs2_withdrawn(sdp) || !test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))

		goto out;



	/* Log might have been flushed while we waited for the flush lock */

fs/gfs2/ops_fstype.c

+1 −3
Original line number Diff line number Diff line
@@ -1539,9 +1539,7 @@ static int gfs2_reconfigure(struct fs_context *fc) 
			return -EINVAL;



		if (fc->sb_flags & SB_RDONLY) {

			error = gfs2_make_fs_ro(sdp);

			if (error)

				errorfc(fc, "unable to remount read-only");

			gfs2_make_fs_ro(sdp);

		} else {

			error = gfs2_make_fs_rw(sdp);

			if (error)

fs/gfs2/super.c

+2 −8
Original line number Diff line number Diff line
@@ -587,9 +587,8 @@ static void gfs2_dirty_inode(struct inode *inode, int flags) 
 * Returns: errno

 */



int gfs2_make_fs_ro(struct gfs2_sbd *sdp)

void gfs2_make_fs_ro(struct gfs2_sbd *sdp)

{

	int error = 0;

	int log_write_allowed = test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);



	gfs2_flush_delete_work(sdp);
@@ -624,8 +623,6 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 


	if (!log_write_allowed)

		sdp->sd_vfs->s_flags |= SB_RDONLY;



	return error;

}



/**
@@ -637,7 +634,6 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp) 
static void gfs2_put_super(struct super_block *sb)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	int error;

	struct gfs2_jdesc *jd;



	/* No more recovery requests */
@@ -658,9 +654,7 @@ static void gfs2_put_super(struct super_block *sb) 
	spin_unlock(&sdp->sd_jindex_spin);



	if (!sb_rdonly(sb)) {

		error = gfs2_make_fs_ro(sdp);

		if (error)

			gfs2_io_error(sdp);

		gfs2_make_fs_ro(sdp);

	}

	WARN_ON(gfs2_withdrawing(sdp));

fs/gfs2/super.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ extern int gfs2_lookup_in_master_dir(struct gfs2_sbd *sdp, char *filename, 
				     struct gfs2_inode **ipp);



extern int gfs2_make_fs_rw(struct gfs2_sbd *sdp);

extern int gfs2_make_fs_ro(struct gfs2_sbd *sdp);

extern void gfs2_make_fs_ro(struct gfs2_sbd *sdp);

extern void gfs2_online_uevent(struct gfs2_sbd *sdp);

extern int gfs2_statfs_init(struct gfs2_sbd *sdp);

extern void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,

fs/gfs2/trans.c

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static struct gfs2_bufdata *gfs2_alloc_bufdata(struct gfs2_glock *gl, 
	bd->bd_bh = bh;

	bd->bd_gl = gl;

	INIT_LIST_HEAD(&bd->bd_list);

	INIT_LIST_HEAD(&bd->bd_ail_st_list);

	INIT_LIST_HEAD(&bd->bd_ail_gl_list);

	bh->b_private = bd;

	return bd;

}