Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8382e26b authored by Joe Perches's avatar Joe Perches Committed by Steven Whitehouse
Browse files

GFS2: Use fs_<level> more often 



Convert a couple of uses of pr_<level> to fs_<level>
Add and use fs_emerg.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d77d1b58

fs/gfs2/quota.c

+2 −2
Original line number Diff line number Diff line
@@ -1083,8 +1083,8 @@ static int print_message(struct gfs2_quota_data *qd, char *type) 
{

	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;



	pr_info("fsid=%s: quota %s for %s %u\n",

		sdp->sd_fsname, type,

	fs_info(sdp, "quota %s for %s %u\n",

		type,

		(qd->qd_id.type == USRQUOTA) ? "user" : "group",

		from_kqid(&init_user_ns, qd->qd_id));

fs/gfs2/util.c

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly; 


void gfs2_assert_i(struct gfs2_sbd *sdp)

{

	pr_emerg("fsid=%s: fatal assertion failed\n", sdp->sd_fsname);

	fs_emerg(sdp, "fatal assertion failed\n");

}



int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
@@ -106,8 +106,8 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, 
		return -2;



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

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

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

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

			assertion, function, file, line);



	if (sdp->sd_args.ar_debug)

		BUG();

fs/gfs2/util.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include "incore.h"



#define fs_emerg(fs, fmt, ...)						\

	pr_emerg("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)

#define fs_warn(fs, fmt, ...)						\

	pr_warn("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)

#define fs_err(fs, fmt, ...)						\