Commit b204b1b6 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Get rid of newlines in log messages 



Get rid of attempts to create multi-line syslog entries; this only makes
the messages harder to read.

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

fs/gfs2/rgrp.c

+5 −5
Original line number Diff line number Diff line
@@ -814,11 +814,11 @@ static int compute_bitstructs(struct gfs2_rgrpd *rgd) 
	bi = rgd->rd_bits + (length - 1);

	if ((bi->bi_start + bi->bi_bytes) * GFS2_NBBY != rgd->rd_data) {

		gfs2_lm(sdp,

			"ri_addr = %llu\n"

			"ri_length = %u\n"

			"ri_data0 = %llu\n"

			"ri_data = %u\n"

			"ri_bitbytes = %u\n"

			"ri_addr=%llu "

			"ri_length=%u "

			"ri_data0=%llu "

			"ri_data=%u "

			"ri_bitbytes=%u "

			"start=%u len=%u offset=%u\n",

			(unsigned long long)rgd->rd_addr,

			rgd->rd_length,

fs/gfs2/util.c

+26 −24
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ void gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion, 
		return;



	fs_err(sdp,

	       "fatal: assertion \"%s\" failed\n"

	       "fatal: assertion \"%s\" failed - "

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

	       assertion, function, file, line);
@@ -407,7 +407,8 @@ void gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, 
		return;



	if (sdp->sd_args.ar_errors == GFS2_ERRORS_WITHDRAW)

		fs_warn(sdp, "warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n",

		fs_warn(sdp, "warning: assertion \"%s\" failed - "

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

			assertion, function, file, line);



	if (sdp->sd_args.ar_debug)
@@ -416,10 +417,10 @@ void gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, 
		dump_stack();



	if (sdp->sd_args.ar_errors == GFS2_ERRORS_PANIC)

		panic("GFS2: fsid=%s: warning: assertion \"%s\" failed\n"

		      "GFS2: fsid=%s:   function = %s, file = %s, line = %u\n",

		panic("GFS2: fsid=%s: warning: assertion \"%s\" failed - "

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

		      sdp->sd_fsname, assertion,

		      sdp->sd_fsname, function, file, line);

		      function, file, line);



	sdp->sd_last_warning = jiffies;

}
@@ -432,7 +433,8 @@ 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",

		"fatal: filesystem consistency error - "

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

		function, file, line);

	gfs2_withdraw(sdp);

}
@@ -447,8 +449,8 @@ void gfs2_consist_inode_i(struct gfs2_inode *ip, 
	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);



	gfs2_lm(sdp,

		"fatal: filesystem consistency error\n"

		"  inode = %llu %llu\n"

		"fatal: filesystem consistency error - "

		"inode = %llu %llu, "

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

		(unsigned long long)ip->i_no_formal_ino,

		(unsigned long long)ip->i_no_addr,
@@ -470,8 +472,8 @@ void gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, 
	sprintf(fs_id_buf, "fsid=%s: ", sdp->sd_fsname);

	gfs2_rgrp_dump(NULL, rgd, fs_id_buf);

	gfs2_lm(sdp,

		"fatal: filesystem consistency error\n"

		"  RG = %llu\n"

		"fatal: filesystem consistency error - "

		"RG = %llu, "

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

		(unsigned long long)rgd->rd_addr,

		function, file, line);
@@ -492,8 +494,8 @@ int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, 
	int me;



	gfs2_lm(sdp,

		"fatal: invalid metadata block\n"

		"  bh = %llu (%s)\n"

		"fatal: invalid metadata block - "

		"bh = %llu (%s), "

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

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

		function, file, line);
@@ -514,8 +516,8 @@ int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, 
	int me;



	gfs2_lm(sdp,

		"fatal: invalid metadata block\n"

		"  bh = %llu (type: exp=%u, found=%u)\n"

		"fatal: invalid metadata block - "

		"bh = %llu (type: exp=%u, found=%u), "

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

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

		function, file, line);
@@ -533,7 +535,7 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, char *file, 
		    unsigned int line)

{

	gfs2_lm(sdp,

		"fatal: I/O error\n"

		"fatal: I/O error - "

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

		function, file, line);

	return gfs2_withdraw(sdp);
@@ -551,8 +553,8 @@ void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh, 
	if (gfs2_withdrawing_or_withdrawn(sdp))

		return;



	fs_err(sdp, "fatal: I/O error\n"

	       "  block = %llu\n"

	fs_err(sdp, "fatal: I/O error - "

	       "block = %llu, "

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

	       (unsigned long long)bh->b_blocknr, function, file, line);

	if (withdraw)

fs/gfs2/bmap.c

+1 −1

File changed.

Contains only whitespace changes.