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

gfs2: replace more printk with calls to fs_info and friends 



This patch replaces a few leftover printk errors with calls to
fs_info and similar, so that the file system having the error is
properly logged.

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

fs/gfs2/bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -1862,9 +1862,8 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length) 
			gfs2_assert_withdraw(sdp, bh);

			if (gfs2_assert_withdraw(sdp,

						 prev_bnr != bh->b_blocknr)) {

				printk(KERN_EMERG "GFS2: fsid=%s:inode %llu, "

				       "block:%llu, i_h:%u, s_h:%u, mp_h:%u\n",

				       sdp->sd_fsname,

				fs_emerg(sdp, "inode %llu, block:%llu, i_h:%u,"

					 "s_h:%u, mp_h:%u\n",

				       (unsigned long long)ip->i_no_addr,

				       prev_bnr, ip->i_height, strip_h, mp_h);

			}

fs/gfs2/glops.c

+2 −1
Original line number Diff line number Diff line
@@ -506,7 +506,8 @@ static void freeze_go_sync(struct gfs2_glock *gl) 
		atomic_set(&sdp->sd_freeze_state, SFS_STARTING_FREEZE);

		error = freeze_super(sdp->sd_vfs);

		if (error) {

			printk(KERN_INFO "GFS2: couldn't freeze filesystem: %d\n", error);

			fs_info(sdp, "GFS2: couldn't freeze filesystem: %d\n",

				error);

			gfs2_assert_withdraw(sdp, 0);

		}

		queue_work(gfs2_freeze_wq, &sdp->sd_freeze_work);

fs/gfs2/rgrp.c

+14 −13
Original line number Diff line number Diff line
@@ -1112,30 +1112,31 @@ static int gfs2_rgrp_lvb_valid(struct gfs2_rgrpd *rgd) 
{

	struct gfs2_rgrp_lvb *rgl = rgd->rd_rgl;

	struct gfs2_rgrp *str = (struct gfs2_rgrp *)rgd->rd_bits[0].bi_bh->b_data;

	struct gfs2_sbd *sdp = rgd->rd_sbd;

	int valid = 1;



	if (rgl->rl_flags != str->rg_flags) {

		printk(KERN_WARNING "GFS2: rgd: %llu lvb flag mismatch %u/%u",

		fs_warn(sdp, "GFS2: rgd: %llu lvb flag mismatch %u/%u",

			(unsigned long long)rgd->rd_addr,

		       be32_to_cpu(rgl->rl_flags), be32_to_cpu(str->rg_flags));

		valid = 0;

	}

	if (rgl->rl_free != str->rg_free) {

		printk(KERN_WARNING "GFS2: rgd: %llu lvb free mismatch %u/%u",

		fs_warn(sdp, "GFS2: rgd: %llu lvb free mismatch %u/%u",

			(unsigned long long)rgd->rd_addr,

			be32_to_cpu(rgl->rl_free), be32_to_cpu(str->rg_free));

		valid = 0;

	}

	if (rgl->rl_dinodes != str->rg_dinodes) {

		printk(KERN_WARNING "GFS2: rgd: %llu lvb dinode mismatch %u/%u",

		fs_warn(sdp, "GFS2: rgd: %llu lvb dinode mismatch %u/%u",

			(unsigned long long)rgd->rd_addr,

			be32_to_cpu(rgl->rl_dinodes),

			be32_to_cpu(str->rg_dinodes));

		valid = 0;

	}

	if (rgl->rl_igeneration != str->rg_igeneration) {

		printk(KERN_WARNING "GFS2: rgd: %llu lvb igen mismatch "

		       "%llu/%llu", (unsigned long long)rgd->rd_addr,

		fs_warn(sdp, "GFS2: rgd: %llu lvb igen mismatch %llu/%llu",

			(unsigned long long)rgd->rd_addr,

			(unsigned long long)be64_to_cpu(rgl->rl_igeneration),

			(unsigned long long)be64_to_cpu(str->rg_igeneration));

		valid = 0;

fs/gfs2/super.c

+3 −3
Original line number Diff line number Diff line
@@ -978,13 +978,13 @@ void gfs2_freeze_func(struct work_struct *work) 
	error = gfs2_glock_nq_init(sdp->sd_freeze_gl, LM_ST_SHARED, 0,

				   &freeze_gh);

	if (error) {

		printk(KERN_INFO "GFS2: couldn't get freeze lock : %d\n", error);

		fs_info(sdp, "GFS2: couldn't get freeze lock : %d\n", error);

		gfs2_assert_withdraw(sdp, 0);

	} else {

		atomic_set(&sdp->sd_freeze_state, SFS_UNFROZEN);

		error = thaw_super(sb);

		if (error) {

			printk(KERN_INFO "GFS2: couldn't thaw filesystem: %d\n",

			fs_info(sdp, "GFS2: couldn't thaw filesystem: %d\n",

				error);

			gfs2_assert_withdraw(sdp, 0);

		}