Commit 02aee814 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v6.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fixes from Andreas Gruenbacher:

 - Fix a freeze consistency check in gfs2_trans_add_meta()

 - Don't use filemap_splice_read as it can cause deadlocks on gfs2

* tag 'gfs2-v6.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Don't use filemap_splice_read
  gfs2: Fix freeze consistency check in gfs2_trans_add_meta
parents da703fe9 0be84321

fs/gfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ const struct file_operations gfs2_file_fops = { 
	.fsync		= gfs2_fsync,

	.lock		= gfs2_lock,

	.flock		= gfs2_flock,

	.splice_read	= filemap_splice_read,

	.splice_read	= copy_splice_read,

	.splice_write	= gfs2_file_splice_write,

	.setlease	= simple_nosetlease,

	.fallocate	= gfs2_fallocate,
@@ -1609,7 +1609,7 @@ const struct file_operations gfs2_file_fops_nolock = { 
	.open		= gfs2_open,

	.release	= gfs2_release,

	.fsync		= gfs2_fsync,

	.splice_read	= filemap_splice_read,

	.splice_read	= copy_splice_read,

	.splice_write	= gfs2_file_splice_write,

	.setlease	= generic_setlease,

	.fallocate	= gfs2_fallocate,

fs/gfs2/trans.c

+10 −4
Original line number Diff line number Diff line
@@ -230,9 +230,11 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) 
{



	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	struct super_block *sb = sdp->sd_vfs;

	struct gfs2_bufdata *bd;

	struct gfs2_meta_header *mh;

	struct gfs2_trans *tr = current->journal_info;

	bool withdraw = false;



	lock_buffer(bh);

	if (buffer_pinned(bh)) {
@@ -266,13 +268,15 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) 
		       (unsigned long long)bd->bd_bh->b_blocknr);

		BUG();

	}

	if (unlikely(test_bit(SDF_FROZEN, &sdp->sd_flags))) {

		fs_info(sdp, "GFS2:adding buf while frozen\n");

		gfs2_assert_withdraw(sdp, 0);

	}

	if (unlikely(gfs2_withdrawn(sdp))) {

		fs_info(sdp, "GFS2:adding buf while withdrawn! 0x%llx\n",

			(unsigned long long)bd->bd_bh->b_blocknr);

		goto out_unlock;

	}

	if (unlikely(sb->s_writers.frozen == SB_FREEZE_COMPLETE)) {

		fs_info(sdp, "GFS2:adding buf while frozen\n");

		withdraw = true;

		goto out_unlock;

	}

	gfs2_pin(sdp, bd->bd_bh);

	mh->__pad0 = cpu_to_be64(0);
@@ -281,6 +285,8 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) 
	tr->tr_num_buf_new++;

out_unlock:

	gfs2_log_unlock(sdp);

	if (withdraw)

		gfs2_assert_withdraw(sdp, 0);

out:

	unlock_buffer(bh);

}