Commit 4529fb15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gfs2 updates from Andreas Gruenbacher:

 - Various withdraw related fixes (freeze glock recursion, thread
   initialization / destruction order, journal recovery, glock cleanup,
   withdraw under journal lock).

 - Some error message improvements.

 - Various minor cleanups.

* tag 'gfs2-v5.14-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Remove redundant check from gfs2_glock_dq
  gfs2: Delay withdraw from atomic context
  gfs2: Don't call dlm after protocol is unmounted
  gfs2: don't stop reads while withdraw in progress
  gfs2: Mark journal inodes as "don't cache"
  gfs2: nit: gfs2_drop_inode shouldn't return bool
  gfs2: Eliminate vestigial HIF_FIRST
  gfs2: Make recovery error more readable
  gfs2: Don't release and reacquire local statfs bh
  gfs2: init system threads before freeze lock
  gfs2: tiny cleanup in gfs2_log_reserve
  gfs2: trivial clean up of gfs2_ail_error
  gfs2: be more verbose replaying invalid rgrp blocks
  gfs2: Fix glock recursion in freeze_go_xmote_bh
  gfs2: Fix memory leak of object lsi on error return path
parents cd358208 08d73666

fs/gfs2/aops.c

+2 −7
Original line number Diff line number Diff line
@@ -574,10 +574,9 @@ void adjust_fs_space(struct inode *inode) 
{

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);

	struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master;

	struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local;

	struct buffer_head *m_bh, *l_bh;

	struct buffer_head *m_bh;

	u64 fs_total, new_free;



	if (gfs2_trans_begin(sdp, 2 * RES_STATFS, 0) != 0)
@@ -600,11 +599,7 @@ void adjust_fs_space(struct inode *inode) 
		(unsigned long long)new_free);

	gfs2_statfs_change(sdp, new_free, new_free, 0);



	if (gfs2_meta_inode_buffer(l_ip, &l_bh) != 0)

		goto out2;

	update_statfs(sdp, m_bh, l_bh);

	brelse(l_bh);

out2:

	update_statfs(sdp, m_bh);

	brelse(m_bh);

out:

	sdp->sd_rindex_uptodate = 0;

fs/gfs2/glock.c

+5 −8
Original line number Diff line number Diff line
@@ -1494,12 +1494,11 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 


	list_del_init(&gh->gh_list);

	clear_bit(HIF_HOLDER, &gh->gh_iflags);

	if (find_first_holder(gl) == NULL) {

	if (list_empty(&gl->gl_holders) &&

	    !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&

	    !test_bit(GLF_DEMOTE, &gl->gl_flags))

		fast_path = 1;

	}



	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl))

		gfs2_glock_add_to_lru(gl);
@@ -2077,8 +2076,6 @@ static const char *hflags2str(char *buf, u16 flags, unsigned long iflags) 
		*p++ = 'H';

	if (test_bit(HIF_WAIT, &iflags))

		*p++ = 'W';

	if (test_bit(HIF_FIRST, &iflags))

		*p++ = 'F';

	*p = 0;

	return buf;

}

fs/gfs2/glops.c

+13 −14
Original line number Diff line number Diff line
@@ -33,16 +33,18 @@ extern struct workqueue_struct *gfs2_control_wq; 


static void gfs2_ail_error(struct gfs2_glock *gl, const struct buffer_head *bh)

{

	fs_err(gl->gl_name.ln_sbd,

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



	fs_err(sdp,

	       "AIL buffer %p: blocknr %llu state 0x%08lx mapping %p page "

	       "state 0x%lx\n",

	       bh, (unsigned long long)bh->b_blocknr, bh->b_state,

	       bh->b_page->mapping, bh->b_page->flags);

	fs_err(gl->gl_name.ln_sbd, "AIL glock %u:%llu mapping %p\n",

	fs_err(sdp, "AIL glock %u:%llu mapping %p\n",

	       gl->gl_name.ln_type, gl->gl_name.ln_number,

	       gfs2_glock2aspace(gl));

	gfs2_lm(gl->gl_name.ln_sbd, "AIL error\n");

	gfs2_withdraw(gl->gl_name.ln_sbd);

	gfs2_lm(sdp, "AIL error\n");

	gfs2_withdraw_delayed(sdp);

}



/**
@@ -610,17 +612,14 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl) 
		j_gl->gl_ops->go_inval(j_gl, DIO_METADATA);



		error = gfs2_find_jhead(sdp->sd_jdesc, &head, false);

		if (error)

			gfs2_consist(sdp);

		if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT))

			gfs2_consist(sdp);



		/*  Initialize some head of the log stuff  */

		if (!gfs2_withdrawn(sdp)) {

		if (gfs2_assert_withdraw_delayed(sdp, !error))

			return error;

		if (gfs2_assert_withdraw_delayed(sdp, head.lh_flags &

						 GFS2_LOG_HEAD_UNMOUNT))

			return -EIO;

		sdp->sd_log_sequence = head.lh_sequence + 1;

		gfs2_log_pointers_init(sdp, head.lh_blkno);

	}

	}

	return 0;

}

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ struct gfs2_lkstats { 
enum {

	/* States */

	HIF_HOLDER		= 6,  /* Set for gh that "holds" the glock */

	HIF_FIRST		= 7,

	HIF_WAIT		= 10,

};
@@ -768,6 +767,7 @@ struct gfs2_sbd { 
	struct gfs2_glock *sd_jinode_gl;



	struct gfs2_holder sd_sc_gh;

	struct buffer_head *sd_sc_bh;

	struct gfs2_holder sd_qc_gh;



	struct completion sd_journal_ready;

fs/gfs2/lock_dlm.c

+5 −0
Original line number Diff line number Diff line
@@ -299,6 +299,11 @@ static void gdlm_put_lock(struct gfs2_glock *gl) 
	gfs2_sbstats_inc(gl, GFS2_LKS_DCOUNT);

	gfs2_update_request_times(gl);



	/* don't want to call dlm if we've unmounted the lock protocol */

	if (test_bit(DFL_UNMOUNT, &ls->ls_recover_flags)) {

		gfs2_glock_free(gl);

		return;

	}

	/* don't want to skip dlm_unlock writing the lvb when lock has one */



	if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) &&