Commit 795405c4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Remove unnecessary gfs2_meta_check_ii argument 



The type argument of gfs2_meta_check_ii() is always set to "magic
number", so remove that argument and hardcode the string in
gfs2_meta_check_ii().  Change the string to "bad magic number" to
emphasize that the problem is the incorrect magic number.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent b204b1b6

fs/gfs2/util.c

+3 −3
Original line number Diff line number Diff line
@@ -488,16 +488,16 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, 
 */



int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,

		       const char *type, const char *function, char *file,

		       const char *function, char *file,

		       unsigned int line)

{

	int me;



	gfs2_lm(sdp,

		"fatal: invalid metadata block - "

		"bh = %llu (%s), "

		"bh = %llu (bad magic number), "

		"function = %s, file = %s, line = %u\n",

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

		(unsigned long long)bh->b_blocknr,

		function, file, line);

	me = gfs2_withdraw(sdp);

	return (me) ? -1 : -2;

fs/gfs2/util.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ gfs2_consist_rgrpd_i((rgd), __func__, __FILE__, __LINE__) 




int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,

		       const char *type, const char *function,

		       const char *function,

		       char *file, unsigned int line);



static inline int gfs2_meta_check(struct gfs2_sbd *sdp,
@@ -123,7 +123,7 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp, 
	u32 magic = be32_to_cpu(mh->mh_magic);

	u16 t = be32_to_cpu(mh->mh_type);

	if (unlikely(magic != GFS2_MAGIC))

		return gfs2_meta_check_ii(sdp, bh, "magic number", function,

		return gfs2_meta_check_ii(sdp, bh, function,

					  file, line);

        if (unlikely(t != type))

		return gfs2_metatype_check_ii(sdp, bh, type, t, function,