Commit a5ca2f1c authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson
Browse files

gfs2: Turn gfs2_consist into void functions 



Change the various gfs2_consist functions to return void.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent d7e7ab3f

fs/gfs2/util.c

+9 −15
Original line number Diff line number Diff line
@@ -138,26 +138,22 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, 


/**

 * gfs2_consist_i - Flag a filesystem consistency error and withdraw

 * Returns: -1 if this call withdrew the machine,

 *          0 if it was already withdrawn

 */



int gfs2_consist_i(struct gfs2_sbd *sdp, const char *function,

void gfs2_consist_i(struct gfs2_sbd *sdp, const char *function,

		    char *file, unsigned int line)

{

	gfs2_lm(sdp,

		"fatal: filesystem consistency error - function = %s, file = %s, line = %u\n",

		function, file, line);

	return gfs2_withdraw(sdp);

	gfs2_withdraw(sdp);

}



/**

 * gfs2_consist_inode_i - Flag an inode consistency error and withdraw

 * Returns: -1 if this call withdrew the machine,

 *          0 if it was already withdrawn

 */



int gfs2_consist_inode_i(struct gfs2_inode *ip,

void gfs2_consist_inode_i(struct gfs2_inode *ip,

			  const char *function, char *file, unsigned int line)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
@@ -169,16 +165,14 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip, 
		(unsigned long long)ip->i_no_formal_ino,

		(unsigned long long)ip->i_no_addr,

		function, file, line);

	return gfs2_withdraw(sdp);

	gfs2_withdraw(sdp);

}



/**

 * gfs2_consist_rgrpd_i - Flag a RG consistency error and withdraw

 * Returns: -1 if this call withdrew the machine,

 *          0 if it was already withdrawn

 */



int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,

void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,

			  const char *function, char *file, unsigned int line)

{

	struct gfs2_sbd *sdp = rgd->rd_sbd;
@@ -192,7 +186,7 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, 
		"  function = %s, file = %s, line = %u\n",

		(unsigned long long)rgd->rd_addr,

		function, file, line);

	return gfs2_withdraw(sdp);

	gfs2_withdraw(sdp);

}



/**

fs/gfs2/util.h

+6 −6
Original line number Diff line number Diff line
@@ -52,21 +52,21 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, 
					__func__, __FILE__, __LINE__))





int gfs2_consist_i(struct gfs2_sbd *sdp,

void gfs2_consist_i(struct gfs2_sbd *sdp,

		    const char *function, char *file, unsigned int line);



#define gfs2_consist(sdp) \

gfs2_consist_i((sdp), __func__, __FILE__, __LINE__)





int gfs2_consist_inode_i(struct gfs2_inode *ip,

void gfs2_consist_inode_i(struct gfs2_inode *ip,

			  const char *function, char *file, unsigned int line);



#define gfs2_consist_inode(ip) \

gfs2_consist_inode_i((ip), __func__, __FILE__, __LINE__)





int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,

void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd,

			  const char *function, char *file, unsigned int line);



#define gfs2_consist_rgrpd(rgd) \