Commit 8481c323 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gfs2 updates from Andreas Gruenbacher:
 "Various minor gfs2 cleanups and fixes"

* tag 'gfs2-v5.16-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: dump inode object for iopen glocks
  gfs2: Fix gfs2_instantiate description
  gfs2: Remove redundant check for GLF_INSTANTIATE_NEEDED
  gfs2: remove redundant set of INSTANTIATE_NEEDED
  gfs2: Fix __gfs2_holder_init function name in kernel-doc comment
parents 1dbfae01 74382e27

fs/gfs2/glock.c

+2 −2
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ find_first_strong_holder(struct gfs2_glock *gl) 


/*

 * gfs2_instantiate - Call the glops instantiate function

 * @gl: The glock

 * @gh: The glock holder

 *

 * Returns: 0 if instantiate was successful, 2 if type specific operation is

 * underway, or error.
@@ -1245,7 +1245,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, 
}



/**

 * gfs2_holder_init - initialize a struct gfs2_holder in the default way

 * __gfs2_holder_init - initialize a struct gfs2_holder in the default way

 * @gl: the glock

 * @state: the state we're requesting

 * @flags: the modifier flags

fs/gfs2/glops.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags) 
	gfs2_rgrp_brelse(rgd);

	WARN_ON_ONCE(!(flags & DIO_METADATA));

	truncate_inode_pages_range(mapping, start, end);

	set_bit(GLF_INSTANTIATE_NEEDED, &gl->gl_flags);

}



static void gfs2_rgrp_go_dump(struct seq_file *seq, struct gfs2_glock *gl,
@@ -764,6 +763,7 @@ const struct gfs2_glock_operations gfs2_freeze_glops = { 
const struct gfs2_glock_operations gfs2_iopen_glops = {

	.go_type = LM_TYPE_IOPEN,

	.go_callback = iopen_go_callback,

	.go_dump = inode_go_dump,

	.go_demote_ok = iopen_go_demote_ok,

	.go_flags = GLOF_LRU | GLOF_NONDISK,

	.go_subclass = 1,

fs/gfs2/super.c

+3 −5
Original line number Diff line number Diff line
@@ -1244,11 +1244,9 @@ static enum dinode_demise evict_should_delete(struct inode *inode, 
	if (ret)

		return SHOULD_NOT_DELETE_DINODE;



	if (test_bit(GLF_INSTANTIATE_NEEDED, &ip->i_gl->gl_flags)) {

	ret = gfs2_instantiate(gh);

	if (ret)

		return SHOULD_NOT_DELETE_DINODE;

	}



	/*

	 * The inode may have been recreated in the meantime.