fs: gfs2: global conversion to pr_foo()
PATCH 1/1 fs: gfs2: global conversion to pr_foo()
-All printk(KERN_foo converted to pr_foo().
-Messages updated to fit in 80 columns.
-fs_macros converted as well.
-fs_printk removed.
Signed-off-by Fabian Frederick <[email protected]>
--- fs/gfs2/dir.c | 7 ++++--- fs/gfs2/glock.c | 19 ++++++++++--------- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/log.c | 4 ++-- fs/gfs2/ops_fstype.c | 18 +++++++++--------- fs/gfs2/quota.c | 2 +- fs/gfs2/rgrp.c | 18 +++++++++--------- fs/gfs2/super.c | 21 ++++++++++++++------- fs/gfs2/trans.c | 8 ++++---- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 11 ++++------- 11 files changed, 66 insertions(+), 60 deletions(-)
fs/gfs2/dir.c +4 -3
@@ -507,7 +507,7 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -printk (KERN_WARNING "gfs2_check_dirent: %s (%s)\n" , msg, +pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, first ?"first in block" :"not first in block" );return -EIO ; }
@@ -531,7 +531,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -printk (KERN_WARNING "gfs2_scan_dirent: wrong block type %u\n" , +pr_warn ("gfs2_scan_dirent: wrong block type %u\n" ,be32_to_cpu (h->mh_type));return -1 ; }
@@ -1006,7 +1006,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -printk (KERN_WARNING "i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth, +be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;
fs/gfs2/glock.c +10 -9
@@ -468,7 +468,8 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("GFS2: wanted %u got %u\n" , + gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);
@@ -542,7 +543,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("GFS2: lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */
@@ -935,7 +936,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err (" %pV" , &vaf); }va_end (args);
@@ -1010,13 +1011,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();
fs/gfs2/lock_dlm.c +3 -3
@@ -176,7 +176,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -printk (KERN_ERR "unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d" , mode);BUG (); } }
@@ -195,7 +195,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -printk (KERN_ERR "unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d" , lmstate);BUG ();return -1 ; }
@@ -308,7 +308,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -printk (KERN_ERR "gdlm_unlock %x,%llx err=%d\n" , +pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ;
fs/gfs2/log.c +2 -2
@@ -690,12 +690,12 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) }if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) { -printk (KERN_INFO "GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, +pr_info ("GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, sdp->sd_log_commited_buf);gfs2_assert_withdraw (sdp,0 ); }if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) { -printk (KERN_INFO "GFS2: log databuf %u %u\n" , +pr_info ("GFS2: log databuf %u %u\n" , sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);gfs2_assert_withdraw (sdp,0 ); }
fs/gfs2/ops_fstype.c +9 -9
@@ -154,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -printk (KERN_WARNING "GFS2: not a GFS2 filesystem\n" ); +pr_warn ("GFS2: not a GFS2 filesystem\n" );return -EINVAL ; }
@@ -176,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error); +pr_warn ("gfs2: error %d reading superblock\n" , error);unlock_page (page); }
@@ -555,7 +555,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" +pr_info ("GFS2 journal mapping error %d: lb=" "%u db=%llu\n" , rc, lb, (unsigned long long )db);break ; }
@@ -563,7 +563,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " +pr_info ("GFS2 error: out of memory " "mapping journal extents.\n" ); rc = -ENOMEM ;break ;
@@ -1008,7 +1008,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -printk (KERN_INFO "GFS2: can't find protocol %s\n" , proto); +pr_info ("GFS2: can't find protocol %s\n" , proto);return -ENOENT ; }
@@ -1115,7 +1115,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -printk (KERN_WARNING "GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;
@@ -1363,7 +1363,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -printk (KERN_WARNING "GFS2: can't parse mount arguments\n" ); +pr_warn ("GFS2: can't parse mount arguments\n" ); goto error_super; }
@@ -1413,7 +1413,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -printk (KERN_WARNING "GFS2: path_lookup on %s returned error %d\n" , +pr_warn ("GFS2: path_lookup on %s returned error %d\n" , dev_name, error);return ERR_PTR (error); }
@@ -1421,7 +1421,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -printk (KERN_WARNING "GFS2: gfs2 mount does not exist\n" ); +pr_warn ("GFS2: gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {
fs/gfs2/quota.c +1 -1
@@ -1081,7 +1081,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , +pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , sdp->sd_fsname, type, (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" ,from_kqid (&init_user_ns, qd->qd_id));
fs/gfs2/rgrp.c +9 -9
@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -printk (KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " +pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " "new_state=%d\n" , rbm->offset, cur_state, new_state); -printk (KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n" , +pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -printk (KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n" , +pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);
@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info (" ri_length = %u\n" , rgd->rd_length); +pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info (" ri_data = %u\n" , rgd->rd_data); +pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/**
@@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, } }if (rbm.rgd->rd_free < *nblocks) { -printk (KERN_WARNING "nblocks=%u\n" , *nblocks); +pr_warn ("nblocks=%u\n" , *nblocks); goto rgrp_error; }
fs/gfs2/super.c +14 -7
@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }
@@ -228,21 +228,26 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -printk (KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: commit mount option requires" +" a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -printk (KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("GFS2: statfs_quantum mount option" +" requires a non-negative numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -printk (KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: quota_quantum mount option" +" requires a positive numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;
@@ -250,7 +255,9 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) rv =match_int (&tmp[0 ], &args->ar_statfs_percent);if (rv || args->ar_statfs_percent <0 || args->ar_statfs_percent >100 ) { -printk (KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n" ); +pr_warn ("statfs_percent mount option requires" +" a numeric argument between 0" +" and 100\n" );return rv ? rv : -EINVAL ; }break ;
@@ -259,7 +266,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }
@@ -279,7 +286,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -printk (KERN_WARNING "GFS2: invalid mount option: %s\n" , o); +pr_warn ("GFS2: invalid mount option: %s\n" , o);return -EINVAL ; } }
fs/gfs2/trans.c +4 -4
@@ -96,11 +96,11 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -printk (KERN_WARNING "GFS2: Transaction created at: %pSR\n" , +pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -printk (KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , +pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -printk (KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , +pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , tr->tr_num_buf_new, tr->tr_num_buf_rm, tr->tr_num_databuf_new, tr->tr_num_databuf_rm, tr->tr_num_revoke, tr->tr_num_revoke_rm);
@@ -230,7 +230,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -printk (KERN_ERR +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG ();
fs/gfs2/util.c +6 -6
@@ -30,7 +30,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , +pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }
@@ -105,11 +105,11 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,return -2 ;if (sdp->sd_args.ar_errors ==GFS2_ERRORS_WITHDRAW ) -printk (KERN_WARNING -"GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" +"GFS2: fsid=%s: function = %s, file = %s," +" line = %u\n" , + sdp->sd_fsname, assertion, + sdp->sd_fsname, function, file, line);if (sdp->sd_args.ar_debug)BUG ();
fs/gfs2/util.h +4 -7
@@ -14,17 +14,14 @@#include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - #define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) + pr_info("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) + pr_warn("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) + pr_err("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)void gfs2_assert_i (struct gfs2_sbd *sdp);
@@ -85,7 +82,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("GFS2: Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Signature · 1 line
1.8.1.4
Hi,
Quoted 6 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.Signed-off-by Fabian Frederick <[email protected]>
Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Steve.
Quoted 455 lines
--- fs/gfs2/dir.c | 7 ++++--- fs/gfs2/glock.c | 19 ++++++++++--------- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/log.c | 4 ++-- fs/gfs2/ops_fstype.c | 18 +++++++++--------- fs/gfs2/quota.c | 2 +- fs/gfs2/rgrp.c | 18 +++++++++--------- fs/gfs2/super.c | 21 ++++++++++++++------- fs/gfs2/trans.c | 8 ++++---- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 11 ++++------- 11 files changed, 66 insertions(+), 60 deletions(-)fs/gfs2/dir.c +4
-3@@ -507,7 +507,7 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -printk (KERN_WARNING "gfs2_check_dirent: %s (%s)\n" , msg, +pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, first ?"first in block" :"not first in block" );return -EIO ; }@@ -531,7 +531,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -printk (KERN_WARNING "gfs2_scan_dirent: wrong block type %u\n" , +pr_warn ("gfs2_scan_dirent: wrong block type %u\n" ,be32_to_cpu (h->mh_type));return -1 ; }@@ -1006,7 +1006,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -printk (KERN_WARNING "i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth, +be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;fs/gfs2/glock.c +10
-9@@ -468,7 +468,8 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("GFS2: wanted %u got %u\n" , + gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);@@ -542,7 +543,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("GFS2: lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */ @@ -935,7 +936,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err (" %pV" , &vaf); }va_end (args);@@ -1010,13 +1011,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();fs/gfs2/lock_dlm.c +3
-3@@ -176,7 +176,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -printk (KERN_ERR "unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d" , mode);BUG (); } }@@ -195,7 +195,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -printk (KERN_ERR "unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d" , lmstate);BUG ();return -1 ; }@@ -308,7 +308,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -printk (KERN_ERR "gdlm_unlock %x,%llx err=%d\n" , +pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ;fs/gfs2/log.c +2
-2@@ -690,12 +690,12 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) }if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) { -printk (KERN_INFO "GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, +pr_info ("GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, sdp->sd_log_commited_buf);gfs2_assert_withdraw (sdp,0 ); }if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) { -printk (KERN_INFO "GFS2: log databuf %u %u\n" , +pr_info ("GFS2: log databuf %u %u\n" , sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);gfs2_assert_withdraw (sdp,0 ); }fs/gfs2/ops_fstype.c +9
-9@@ -154,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -printk (KERN_WARNING "GFS2: not a GFS2 filesystem\n" ); +pr_warn ("GFS2: not a GFS2 filesystem\n" );return -EINVAL ; }@@ -176,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error); +pr_warn ("gfs2: error %d reading superblock\n" , error);unlock_page (page); }@@ -555,7 +555,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" +pr_info ("GFS2 journal mapping error %d: lb=" "%u db=%llu\n" , rc, lb, (unsigned long long )db);break ; }@@ -563,7 +563,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " +pr_info ("GFS2 error: out of memory " "mapping journal extents.\n" ); rc = -ENOMEM ;break ;@@ -1008,7 +1008,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -printk (KERN_INFO "GFS2: can't find protocol %s\n" , proto); +pr_info ("GFS2: can't find protocol %s\n" , proto);return -ENOENT ; }@@ -1115,7 +1115,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -printk (KERN_WARNING "GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;@@ -1363,7 +1363,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -printk (KERN_WARNING "GFS2: can't parse mount arguments\n" ); +pr_warn ("GFS2: can't parse mount arguments\n" ); goto error_super; }@@ -1413,7 +1413,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -printk (KERN_WARNING "GFS2: path_lookup on %s returned error %d\n" , +pr_warn ("GFS2: path_lookup on %s returned error %d\n" , dev_name, error);return ERR_PTR (error); }@@ -1421,7 +1421,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -printk (KERN_WARNING "GFS2: gfs2 mount does not exist\n" ); +pr_warn ("GFS2: gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {fs/gfs2/quota.c +1
-1@@ -1081,7 +1081,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , +pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , sdp->sd_fsname, type, (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" ,from_kqid (&init_user_ns, qd->qd_id));fs/gfs2/rgrp.c +9
-9@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -printk (KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " +pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " "new_state=%d\n" , rbm->offset, cur_state, new_state); -printk (KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n" , +pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -printk (KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n" , +pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info (" ri_length = %u\n" , rgd->rd_length); +pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info (" ri_data = %u\n" , rgd->rd_data); +pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/** @@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, } }if (rbm.rgd->rd_free < *nblocks) { -printk (KERN_WARNING "nblocks=%u\n" , *nblocks); +pr_warn ("nblocks=%u\n" , *nblocks); goto rgrp_error; }fs/gfs2/super.c +14
-7@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -228,21 +228,26 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -printk (KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: commit mount option requires" +" a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -printk (KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("GFS2: statfs_quantum mount option" +" requires a non-negative numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -printk (KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: quota_quantum mount option" +" requires a positive numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;@@ -250,7 +255,9 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) rv =match_int (&tmp[0 ], &args->ar_statfs_percent);if (rv || args->ar_statfs_percent <0 || args->ar_statfs_percent >100 ) { -printk (KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n" ); +pr_warn ("statfs_percent mount option requires" +" a numeric argument between 0" +" and 100\n" );return rv ? rv : -EINVAL ; }break ;@@ -259,7 +266,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -279,7 +286,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -printk (KERN_WARNING "GFS2: invalid mount option: %s\n" , o); +pr_warn ("GFS2: invalid mount option: %s\n" , o);return -EINVAL ; } }fs/gfs2/trans.c +4
-4@@ -96,11 +96,11 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -printk (KERN_WARNING "GFS2: Transaction created at: %pSR\n" , +pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -printk (KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , +pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -printk (KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , +pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , tr->tr_num_buf_new, tr->tr_num_buf_rm, tr->tr_num_databuf_new, tr->tr_num_databuf_rm, tr->tr_num_revoke, tr->tr_num_revoke_rm);@@ -230,7 +230,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -printk (KERN_ERR +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG ();fs/gfs2/util.c +6
-6@@ -30,7 +30,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , +pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }@@ -105,11 +105,11 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,return -2 ;if (sdp->sd_args.ar_errors ==GFS2_ERRORS_WITHDRAW ) -printk (KERN_WARNING -"GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" +"GFS2: fsid=%s: function = %s, file = %s," +" line = %u\n" , + sdp->sd_fsname, assertion, + sdp->sd_fsname, function, file, line);if (sdp->sd_args.ar_debug)BUG ();fs/gfs2/util.h +4
-7@@ -14,17 +14,14 @@#include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - #define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) + pr_info("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) + pr_warn("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) + pr_err("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)void gfs2_assert_i (struct gfs2_sbd *sdp);@@ -85,7 +82,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("GFS2: Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Quoted 8 lines · On Thu, 06 Mar 2014 15:44:04 +0000 Steven Whitehouse <[email protected]>…
Hi,
Quoted 5 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.
Quoted 7 lines
Quoted 1 line
Signed-off-by Fabian Frederick <[email protected]>Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Steve.
Hi Steve,
Maybe I'm not looking at the right place (steve/gfs2-3.0-nmw.git/) but gfs2 in that tree (with patch applied) still has 25 printk entries. Original patch just keeps 3 printk : 1 commented line, "GFS2 installed" and vprintk(fmt...
Fabian
Quoted 458 lines
Quoted 456 lines
--- fs/gfs2/dir.c | 7 ++++--- fs/gfs2/glock.c | 19 ++++++++++--------- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/log.c | 4 ++-- fs/gfs2/ops_fstype.c | 18 +++++++++--------- fs/gfs2/quota.c | 2 +- fs/gfs2/rgrp.c | 18 +++++++++--------- fs/gfs2/super.c | 21 ++++++++++++++------- fs/gfs2/trans.c | 8 ++++---- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 11 ++++------- 11 files changed, 66 insertions(+), 60 deletions(-)fs/gfs2/dir.c +4
-3@@ -507,7 +507,7 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -printk (KERN_WARNING "gfs2_check_dirent: %s (%s)\n" , msg, +pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, first ?"first in block" :"not first in block" );return -EIO ; }@@ -531,7 +531,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -printk (KERN_WARNING "gfs2_scan_dirent: wrong block type %u\n" , +pr_warn ("gfs2_scan_dirent: wrong block type %u\n" ,be32_to_cpu (h->mh_type));return -1 ; }@@ -1006,7 +1006,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -printk (KERN_WARNING "i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth, +be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;fs/gfs2/glock.c +10
-9@@ -468,7 +468,8 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("GFS2: wanted %u got %u\n" , + gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);@@ -542,7 +543,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("GFS2: lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */ @@ -935,7 +936,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err (" %pV" , &vaf); }va_end (args);@@ -1010,13 +1011,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();fs/gfs2/lock_dlm.c +3
-3@@ -176,7 +176,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -printk (KERN_ERR "unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d" , mode);BUG (); } }@@ -195,7 +195,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -printk (KERN_ERR "unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d" , lmstate);BUG ();return -1 ; }@@ -308,7 +308,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -printk (KERN_ERR "gdlm_unlock %x,%llx err=%d\n" , +pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ;fs/gfs2/log.c +2
-2@@ -690,12 +690,12 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) }if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) { -printk (KERN_INFO "GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, +pr_info ("GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, sdp->sd_log_commited_buf);gfs2_assert_withdraw (sdp,0 ); }if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) { -printk (KERN_INFO "GFS2: log databuf %u %u\n" , +pr_info ("GFS2: log databuf %u %u\n" , sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);gfs2_assert_withdraw (sdp,0 ); }fs/gfs2/ops_fstype.c +9
-9@@ -154,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -printk (KERN_WARNING "GFS2: not a GFS2 filesystem\n" ); +pr_warn ("GFS2: not a GFS2 filesystem\n" );return -EINVAL ; }@@ -176,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error); +pr_warn ("gfs2: error %d reading superblock\n" , error);unlock_page (page); }@@ -555,7 +555,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" +pr_info ("GFS2 journal mapping error %d: lb=" "%u db=%llu\n" , rc, lb, (unsigned long long )db);break ; }@@ -563,7 +563,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " +pr_info ("GFS2 error: out of memory " "mapping journal extents.\n" ); rc = -ENOMEM ;break ;@@ -1008,7 +1008,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -printk (KERN_INFO "GFS2: can't find protocol %s\n" , proto); +pr_info ("GFS2: can't find protocol %s\n" , proto);return -ENOENT ; }@@ -1115,7 +1115,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -printk (KERN_WARNING "GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;@@ -1363,7 +1363,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -printk (KERN_WARNING "GFS2: can't parse mount arguments\n" ); +pr_warn ("GFS2: can't parse mount arguments\n" ); goto error_super; }@@ -1413,7 +1413,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -printk (KERN_WARNING "GFS2: path_lookup on %s returned error %d\n" , +pr_warn ("GFS2: path_lookup on %s returned error %d\n" , dev_name, error);return ERR_PTR (error); }@@ -1421,7 +1421,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -printk (KERN_WARNING "GFS2: gfs2 mount does not exist\n" ); +pr_warn ("GFS2: gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {fs/gfs2/quota.c +1
-1@@ -1081,7 +1081,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , +pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , sdp->sd_fsname, type, (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" ,from_kqid (&init_user_ns, qd->qd_id));fs/gfs2/rgrp.c +9
-9@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -printk (KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " +pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " "new_state=%d\n" , rbm->offset, cur_state, new_state); -printk (KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n" , +pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -printk (KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n" , +pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info (" ri_length = %u\n" , rgd->rd_length); +pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info (" ri_data = %u\n" , rgd->rd_data); +pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/** @@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, } }if (rbm.rgd->rd_free < *nblocks) { -printk (KERN_WARNING "nblocks=%u\n" , *nblocks); +pr_warn ("nblocks=%u\n" , *nblocks); goto rgrp_error; }fs/gfs2/super.c +14
-7@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -228,21 +228,26 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -printk (KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: commit mount option requires" +" a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -printk (KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("GFS2: statfs_quantum mount option" +" requires a non-negative numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -printk (KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: quota_quantum mount option" +" requires a positive numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;@@ -250,7 +255,9 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) rv =match_int (&tmp[0 ], &args->ar_statfs_percent);if (rv || args->ar_statfs_percent <0 || args->ar_statfs_percent >100 ) { -printk (KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n" ); +pr_warn ("statfs_percent mount option requires" +" a numeric argument between 0" +" and 100\n" );return rv ? rv : -EINVAL ; }break ;@@ -259,7 +266,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -279,7 +286,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -printk (KERN_WARNING "GFS2: invalid mount option: %s\n" , o); +pr_warn ("GFS2: invalid mount option: %s\n" , o);return -EINVAL ; } }fs/gfs2/trans.c +4
-4@@ -96,11 +96,11 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -printk (KERN_WARNING "GFS2: Transaction created at: %pSR\n" , +pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -printk (KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , +pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -printk (KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , +pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , tr->tr_num_buf_new, tr->tr_num_buf_rm, tr->tr_num_databuf_new, tr->tr_num_databuf_rm, tr->tr_num_revoke, tr->tr_num_revoke_rm);@@ -230,7 +230,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -printk (KERN_ERR +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG ();fs/gfs2/util.c +6
-6@@ -30,7 +30,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , +pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }@@ -105,11 +105,11 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,return -2 ;if (sdp->sd_args.ar_errors ==GFS2_ERRORS_WITHDRAW ) -printk (KERN_WARNING -"GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" +"GFS2: fsid=%s: function = %s, file = %s," +" line = %u\n" , + sdp->sd_fsname, assertion, + sdp->sd_fsname, function, file, line);if (sdp->sd_args.ar_debug)BUG ();fs/gfs2/util.h +4
-7@@ -14,17 +14,14 @@#include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - #define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) + pr_info("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) + pr_warn("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) + pr_err("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)void gfs2_assert_i (struct gfs2_sbd *sdp);@@ -85,7 +82,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("GFS2: Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Hi,
Quoted 17 lines · Fabian Frederick
Quoted 14 lines · On Thu, 06 Mar 2014 15:44:04 +0000 Steven Whitehouse <[email protected]>…
Hi,
Quoted 6 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.Signed-off-by Fabian Frederick <[email protected]>Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Quoted 8 lines
Quoted 1 line
Steve.
Hi Steve,
Maybe I'm not looking at the right place (steve/gfs2-3.0-nmw.git/) but gfs2 in that tree (with patch applied) still has 25 printk entries. Original patch just keeps 3 printk : 1 commented line, "GFS2 installed" and vprintk(fmt...
Fabian
Yes, I see now... I think git didn't give me the full list of files with rejects or something like that. Anyway I've picked up the other bits that were missing now and I think it should now be complete,
Steve.
Quoted 460 lines
Quoted 460 lines
Quoted 458 lines
--- fs/gfs2/dir.c | 7 ++++--- fs/gfs2/glock.c | 19 ++++++++++--------- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/log.c | 4 ++-- fs/gfs2/ops_fstype.c | 18 +++++++++--------- fs/gfs2/quota.c | 2 +- fs/gfs2/rgrp.c | 18 +++++++++--------- fs/gfs2/super.c | 21 ++++++++++++++------- fs/gfs2/trans.c | 8 ++++---- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 11 ++++------- 11 files changed, 66 insertions(+), 60 deletions(-)fs/gfs2/dir.c +4
-3@@ -507,7 +507,7 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -printk (KERN_WARNING "gfs2_check_dirent: %s (%s)\n" , msg, +pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, first ?"first in block" :"not first in block" );return -EIO ; }@@ -531,7 +531,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -printk (KERN_WARNING "gfs2_scan_dirent: wrong block type %u\n" , +pr_warn ("gfs2_scan_dirent: wrong block type %u\n" ,be32_to_cpu (h->mh_type));return -1 ; }@@ -1006,7 +1006,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -printk (KERN_WARNING "i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth, +be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;fs/gfs2/glock.c +10
-9@@ -468,7 +468,8 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("GFS2: wanted %u got %u\n" , + gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);@@ -542,7 +543,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("GFS2: lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */ @@ -935,7 +936,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err (" %pV" , &vaf); }va_end (args);@@ -1010,13 +1011,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();fs/gfs2/lock_dlm.c +3
-3@@ -176,7 +176,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -printk (KERN_ERR "unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d" , mode);BUG (); } }@@ -195,7 +195,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -printk (KERN_ERR "unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d" , lmstate);BUG ();return -1 ; }@@ -308,7 +308,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -printk (KERN_ERR "gdlm_unlock %x,%llx err=%d\n" , +pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ;fs/gfs2/log.c +2
-2@@ -690,12 +690,12 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) }if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) { -printk (KERN_INFO "GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, +pr_info ("GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, sdp->sd_log_commited_buf);gfs2_assert_withdraw (sdp,0 ); }if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) { -printk (KERN_INFO "GFS2: log databuf %u %u\n" , +pr_info ("GFS2: log databuf %u %u\n" , sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);gfs2_assert_withdraw (sdp,0 ); }fs/gfs2/ops_fstype.c +9
-9@@ -154,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -printk (KERN_WARNING "GFS2: not a GFS2 filesystem\n" ); +pr_warn ("GFS2: not a GFS2 filesystem\n" );return -EINVAL ; }@@ -176,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error); +pr_warn ("gfs2: error %d reading superblock\n" , error);unlock_page (page); }@@ -555,7 +555,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" +pr_info ("GFS2 journal mapping error %d: lb=" "%u db=%llu\n" , rc, lb, (unsigned long long )db);break ; }@@ -563,7 +563,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " +pr_info ("GFS2 error: out of memory " "mapping journal extents.\n" ); rc = -ENOMEM ;break ;@@ -1008,7 +1008,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -printk (KERN_INFO "GFS2: can't find protocol %s\n" , proto); +pr_info ("GFS2: can't find protocol %s\n" , proto);return -ENOENT ; }@@ -1115,7 +1115,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -printk (KERN_WARNING "GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;@@ -1363,7 +1363,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -printk (KERN_WARNING "GFS2: can't parse mount arguments\n" ); +pr_warn ("GFS2: can't parse mount arguments\n" ); goto error_super; }@@ -1413,7 +1413,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -printk (KERN_WARNING "GFS2: path_lookup on %s returned error %d\n" , +pr_warn ("GFS2: path_lookup on %s returned error %d\n" , dev_name, error);return ERR_PTR (error); }@@ -1421,7 +1421,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -printk (KERN_WARNING "GFS2: gfs2 mount does not exist\n" ); +pr_warn ("GFS2: gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {fs/gfs2/quota.c +1
-1@@ -1081,7 +1081,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , +pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , sdp->sd_fsname, type, (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" ,from_kqid (&init_user_ns, qd->qd_id));fs/gfs2/rgrp.c +9
-9@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -printk (KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " +pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " "new_state=%d\n" , rbm->offset, cur_state, new_state); -printk (KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n" , +pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -printk (KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n" , +pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info (" ri_length = %u\n" , rgd->rd_length); +pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info (" ri_data = %u\n" , rgd->rd_data); +pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/** @@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, } }if (rbm.rgd->rd_free < *nblocks) { -printk (KERN_WARNING "nblocks=%u\n" , *nblocks); +pr_warn ("nblocks=%u\n" , *nblocks); goto rgrp_error; }fs/gfs2/super.c +14
-7@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -228,21 +228,26 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -printk (KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: commit mount option requires" +" a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -printk (KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("GFS2: statfs_quantum mount option" +" requires a non-negative numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -printk (KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: quota_quantum mount option" +" requires a positive numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;@@ -250,7 +255,9 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) rv =match_int (&tmp[0 ], &args->ar_statfs_percent);if (rv || args->ar_statfs_percent <0 || args->ar_statfs_percent >100 ) { -printk (KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n" ); +pr_warn ("statfs_percent mount option requires" +" a numeric argument between 0" +" and 100\n" );return rv ? rv : -EINVAL ; }break ;@@ -259,7 +266,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -279,7 +286,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -printk (KERN_WARNING "GFS2: invalid mount option: %s\n" , o); +pr_warn ("GFS2: invalid mount option: %s\n" , o);return -EINVAL ; } }fs/gfs2/trans.c +4
-4@@ -96,11 +96,11 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -printk (KERN_WARNING "GFS2: Transaction created at: %pSR\n" , +pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -printk (KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , +pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -printk (KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , +pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , tr->tr_num_buf_new, tr->tr_num_buf_rm, tr->tr_num_databuf_new, tr->tr_num_databuf_rm, tr->tr_num_revoke, tr->tr_num_revoke_rm);@@ -230,7 +230,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -printk (KERN_ERR +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG ();fs/gfs2/util.c +6
-6@@ -30,7 +30,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , +pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }@@ -105,11 +105,11 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,return -2 ;if (sdp->sd_args.ar_errors ==GFS2_ERRORS_WITHDRAW ) -printk (KERN_WARNING -"GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" +"GFS2: fsid=%s: function = %s, file = %s," +" line = %u\n" , + sdp->sd_fsname, assertion, + sdp->sd_fsname, function, file, line);if (sdp->sd_args.ar_debug)BUG ();fs/gfs2/util.h +4
-7@@ -14,17 +14,14 @@#include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - #define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) + pr_info("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) + pr_warn("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) + pr_err("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)void gfs2_assert_i (struct gfs2_sbd *sdp);@@ -85,7 +82,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("GFS2: Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Quoted 26 lines · On Thu, 06 Mar 2014 17:57:42 +0000 Steven Whitehouse <[email protected]>…
Hi,
Quoted 23 lines · Fabian Frederick
Quoted 8 lines · On Thu, 06 Mar 2014 15:44:04 +0000 Steven Whitehouse <[email protected]>…
Hi,
Quoted 5 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.Quoted 7 lines
Quoted 1 line
Signed-off-by Fabian Frederick <[email protected]>Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Steve.
Hi Steve,
Maybe I'm not looking at the right place (steve/gfs2-3.0-nmw.git/) but gfs2 in that tree (with patch applied) still has 25 printk entries. Original patch just keeps 3 printk : 1 commented line, "GFS2 installed" and vprintk(fmt...
Quoted 7 lines
Quoted 2 lines
Fabian
Yes, I see now... I think git didn't give me the full list of files with rejects or something like that. Anyway I've picked up the other bits that were missing now and I think it should now be complete,
Steve.
Thanks :) It seems better now except fs_macros in util.h but I guess Joe will update all that stuff anyway.
Fabian
Quoted 463 lines
Quoted 461 lines
Quoted 461 lines
Quoted 459 lines
--- fs/gfs2/dir.c | 7 ++++--- fs/gfs2/glock.c | 19 ++++++++++--------- fs/gfs2/lock_dlm.c | 6 +++--- fs/gfs2/log.c | 4 ++-- fs/gfs2/ops_fstype.c | 18 +++++++++--------- fs/gfs2/quota.c | 2 +- fs/gfs2/rgrp.c | 18 +++++++++--------- fs/gfs2/super.c | 21 ++++++++++++++------- fs/gfs2/trans.c | 8 ++++---- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 11 ++++------- 11 files changed, 66 insertions(+), 60 deletions(-)fs/gfs2/dir.c +4
-3@@ -507,7 +507,7 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -printk (KERN_WARNING "gfs2_check_dirent: %s (%s)\n" , msg, +pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, first ?"first in block" :"not first in block" );return -EIO ; }@@ -531,7 +531,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -printk (KERN_WARNING "gfs2_scan_dirent: wrong block type %u\n" , +pr_warn ("gfs2_scan_dirent: wrong block type %u\n" ,be32_to_cpu (h->mh_type));return -1 ; }@@ -1006,7 +1006,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -printk (KERN_WARNING "i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth, +be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;fs/gfs2/glock.c +10
-9@@ -468,7 +468,8 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("GFS2: wanted %u got %u\n" , + gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);@@ -542,7 +543,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("GFS2: lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */ @@ -935,7 +936,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err (" %pV" , &vaf); }va_end (args);@@ -1010,13 +1011,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();fs/gfs2/lock_dlm.c +3
-3@@ -176,7 +176,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -printk (KERN_ERR "unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d" , mode);BUG (); } }@@ -195,7 +195,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -printk (KERN_ERR "unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d" , lmstate);BUG ();return -1 ; }@@ -308,7 +308,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -printk (KERN_ERR "gdlm_unlock %x,%llx err=%d\n" , +pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ;fs/gfs2/log.c +2
-2@@ -690,12 +690,12 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) }if (sdp->sd_log_num_buf != sdp->sd_log_commited_buf) { -printk (KERN_INFO "GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, +pr_info ("GFS2: log buf %u %u\n" , sdp->sd_log_num_buf, sdp->sd_log_commited_buf);gfs2_assert_withdraw (sdp,0 ); }if (sdp->sd_log_num_databuf != sdp->sd_log_commited_databuf) { -printk (KERN_INFO "GFS2: log databuf %u %u\n" , +pr_info ("GFS2: log databuf %u %u\n" , sdp->sd_log_num_databuf, sdp->sd_log_commited_databuf);gfs2_assert_withdraw (sdp,0 ); }fs/gfs2/ops_fstype.c +9
-9@@ -154,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -printk (KERN_WARNING "GFS2: not a GFS2 filesystem\n" ); +pr_warn ("GFS2: not a GFS2 filesystem\n" );return -EINVAL ; }@@ -176,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error); +pr_warn ("gfs2: error %d reading superblock\n" , error);unlock_page (page); }@@ -555,7 +555,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" +pr_info ("GFS2 journal mapping error %d: lb=" "%u db=%llu\n" , rc, lb, (unsigned long long )db);break ; }@@ -563,7 +563,7 @@ static int map_journal_extents(struct gfs2_sbd *sdp) jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " +pr_info ("GFS2 error: out of memory " "mapping journal extents.\n" ); rc = -ENOMEM ;break ;@@ -1008,7 +1008,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -printk (KERN_INFO "GFS2: can't find protocol %s\n" , proto); +pr_info ("GFS2: can't find protocol %s\n" , proto);return -ENOENT ; }@@ -1115,7 +1115,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -printk (KERN_WARNING "GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;@@ -1363,7 +1363,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -printk (KERN_WARNING "GFS2: can't parse mount arguments\n" ); +pr_warn ("GFS2: can't parse mount arguments\n" ); goto error_super; }@@ -1413,7 +1413,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -printk (KERN_WARNING "GFS2: path_lookup on %s returned error %d\n" , +pr_warn ("GFS2: path_lookup on %s returned error %d\n" , dev_name, error);return ERR_PTR (error); }@@ -1421,7 +1421,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -printk (KERN_WARNING "GFS2: gfs2 mount does not exist\n" ); +pr_warn ("GFS2: gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {fs/gfs2/quota.c +1
-1@@ -1081,7 +1081,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , +pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , sdp->sd_fsname, type, (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" ,from_kqid (&init_user_ns, qd->qd_id));fs/gfs2/rgrp.c +9
-9@@ -99,11 +99,11 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -printk (KERN_WARNING "GFS2: buf_blk = 0x%x old_state=%d, " +pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " "new_state=%d\n" , rbm->offset, cur_state, new_state); -printk (KERN_WARNING "GFS2: rgrp=0x%llx bi_start=0x%x\n" , +pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -printk (KERN_WARNING "GFS2: bi_offset=0x%x bi_len=0x%x\n" , +pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);@@ -736,11 +736,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info (" ri_length = %u\n" , rgd->rd_length); +pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info (" ri_data = %u\n" , rgd->rd_data); +pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/** @@ -2278,7 +2278,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, } }if (rbm.rgd->rd_free < *nblocks) { -printk (KERN_WARNING "nblocks=%u\n" , *nblocks); +pr_warn ("nblocks=%u\n" , *nblocks); goto rgrp_error; }fs/gfs2/super.c +14
-7@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -228,21 +228,26 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -printk (KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: commit mount option requires" +" a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -printk (KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("GFS2: statfs_quantum mount option" +" requires a non-negative numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -printk (KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("GFS2: quota_quantum mount option" +" requires a positive numeric" +" argument\n" );return rv ? rv : -EINVAL ; }break ;@@ -250,7 +255,9 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) rv =match_int (&tmp[0 ], &args->ar_statfs_percent);if (rv || args->ar_statfs_percent <0 || args->ar_statfs_percent >100 ) { -printk (KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n" ); +pr_warn ("statfs_percent mount option requires" +" a numeric argument between 0" +" and 100\n" );return rv ? rv : -EINVAL ; }break ;@@ -259,7 +266,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -printk (KERN_WARNING "GFS2: -o debug and -o errors=panic " +pr_warn ("GFS2: -o debug and -o errors=panic " "are mutually exclusive.\n" );return -EINVAL ; }@@ -279,7 +286,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -printk (KERN_WARNING "GFS2: invalid mount option: %s\n" , o); +pr_warn ("GFS2: invalid mount option: %s\n" , o);return -EINVAL ; } }fs/gfs2/trans.c +4
-4@@ -96,11 +96,11 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -printk (KERN_WARNING "GFS2: Transaction created at: %pSR\n" , +pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -printk (KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , +pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n" , tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -printk (KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , +pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , tr->tr_num_buf_new, tr->tr_num_buf_rm, tr->tr_num_databuf_new, tr->tr_num_databuf_rm, tr->tr_num_revoke, tr->tr_num_revoke_rm);@@ -230,7 +230,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -printk (KERN_ERR +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG ();fs/gfs2/util.c +6
-6@@ -30,7 +30,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , +pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }@@ -105,11 +105,11 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,return -2 ;if (sdp->sd_args.ar_errors ==GFS2_ERRORS_WITHDRAW ) -printk (KERN_WARNING -"GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" +"GFS2: fsid=%s: function = %s, file = %s," +" line = %u\n" , + sdp->sd_fsname, assertion, + sdp->sd_fsname, function, file, line);if (sdp->sd_args.ar_debug)BUG ();fs/gfs2/util.h +4
-7@@ -14,17 +14,14 @@#include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - #define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) + pr_info("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) + pr_warn("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) #define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) + pr_err("GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)void gfs2_assert_i (struct gfs2_sbd *sdp);@@ -85,7 +82,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("GFS2: Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
cover gfs: More logging neatening
Joe Perches (3):
gfs2: Use pr_<level> more consistently
gfs2: Use fs_<level> more often
gfs2: Convert gfs2_lm_withdraw to use fs_err
fs/gfs2/dir.c | 14 ++++---- fs/gfs2/glock.c | 8 +++-- fs/gfs2/lock_dlm.c | 9 +++-- fs/gfs2/main.c | 2 ++ fs/gfs2/ops_fstype.c | 25 ++++++------- fs/gfs2/quota.c | 10 +++--- fs/gfs2/rgrp.c | 24 +++++++------ fs/gfs2/super.c | 16 ++++----- fs/gfs2/sys.c | 6 ++-- fs/gfs2/trans.c | 19 +++++----- fs/gfs2/util.c | 99 +++++++++++++++++++++++++--------------------------- fs/gfs2/util.h | 31 ++++++++-------- 12 files changed, 138 insertions(+), 125 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Re: [PATCH 0/3] gfs: More logging neatening
Hi,
Quoted 5 lines · Joe Perches
Joe Perches (3):
gfs2: Use pr_<level> more consistently
gfs2: Use fs_<level> more often
gfs2: Convertgfs2_lm_withdrawto usefs_err
Quoted 14 lines
fs/gfs2/dir.c | 14 ++++---- fs/gfs2/glock.c | 8 +++-- fs/gfs2/lock_dlm.c | 9 +++-- fs/gfs2/main.c | 2 ++ fs/gfs2/ops_fstype.c | 25 ++++++------- fs/gfs2/quota.c | 10 +++--- fs/gfs2/rgrp.c | 24 +++++++------ fs/gfs2/super.c | 16 ++++----- fs/gfs2/sys.c | 6 ++-- fs/gfs2/trans.c | 19 +++++----- fs/gfs2/util.c | 99 +++++++++++++++++++++++++--------------------------- fs/gfs2/util.h | 31 ++++++++-------- 12 files changed, 138 insertions(+), 125 deletions(-)
Thanks for the patches. I've added them to the -nmw tree, and I did spot the V2 patch of the third one,
Steve.
PATCH 1/3 gfs2: Use pr_<level> more consistently
In reply to Fabian FrederickAdd pr_fmt, remove embedded "GFS2: " prefixes.
This now consistently emits lower case "gfs2: " for each message.
Other miscellanea around these changes:
o Add missing newlines
o Coalesce formats
o Realign arguments
Signed-off-by Joe Perches <[email protected]>
--- fs/gfs2/dir.c | 14 ++++++++------ fs/gfs2/glock.c | 8 +++++--- fs/gfs2/lock_dlm.c | 9 ++++++--- fs/gfs2/main.c | 2 ++ fs/gfs2/ops_fstype.c | 25 +++++++++++++------------ fs/gfs2/quota.c | 10 ++++++---- fs/gfs2/rgrp.c | 24 +++++++++++++----------- fs/gfs2/super.c | 16 ++++++++-------- fs/gfs2/sys.c | 2 ++ fs/gfs2/trans.c | 19 ++++++++++--------- fs/gfs2/util.c | 12 ++++++------ fs/gfs2/util.h | 25 ++++++++++++------------- 12 files changed, 91 insertions(+), 75 deletions(-)
fs/gfs2/dir.c +8 -6
@@ -53,6 +53,8 @@* but never before the maximum hash table size has been reached. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/buffer_head.h>
@@ -507,8 +509,8 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, - first ?"first in block" :"not first in block" ); +pr_warn ("%s: %s (%s)\n" , + __func__, msg, first ?"first in block" :"not first in block" );return -EIO ; }
@@ -531,8 +533,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -pr_warn ("gfs2_scan_dirent: wrong block type %u\n" , -be32_to_cpu (h->mh_type)); +pr_warn ("%s: wrong block type %u\n" , __func__,be32_to_cpu (h->mh_type));return -1 ; }
@@ -728,7 +729,7 @@ static int get_leaf(struct gfs2_inode *dip, u64 leaf_no, error =gfs2_meta_read (dip->i_gl, leaf_no,DIO_WAIT , bhp);if (!error &&gfs2_metatype_check (GFS2_SB (&dip->i_inode), *bhp,GFS2_METATYPE_LF )) { -/* printk(KERN_INFO "block num=%llu\n", leaf_no); */ +/* pr_info("block num=%llu\n", leaf_no); */ error = -EIO ; }
@@ -1006,7 +1007,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , + dip->i_depth,be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;
fs/gfs2/glock.c +5 -3
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -468,7 +470,7 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -pr_err ("GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("wanted %u got %u\n" , gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);
@@ -542,7 +544,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -pr_err ("GFS2: lm_lock ret %d\n" , ret); +pr_err ("lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */
@@ -935,7 +937,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -pr_err (" %pV" , &vaf); +pr_err ("%pV" , &vaf); }va_end (args);
fs/gfs2/lock_dlm.c +6 -3
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/fs.h> #include <linux/dlm.h> #include <linux/slab.h>
@@ -176,7 +178,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -pr_err ("unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d\n" , mode);BUG (); } }
@@ -195,7 +197,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -pr_err ("unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d\n" , lmstate);BUG ();return -1 ; }
@@ -308,7 +310,8 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, +pr_err ("gdlm_unlock %x,%llx err=%d\n" , + gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ; }
fs/gfs2/main.c +2 -0
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h>
fs/gfs2/ops_fstype.c +13 -12
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -152,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -pr_warn ("GFS2: not a GFS2 filesystem\n" ); +pr_warn ("not a GFS2 filesystem\n" );return -EINVAL ; }
@@ -174,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -pr_warn ("gfs2: error %d reading superblock\n" , error); +pr_warn ("error %d reading superblock\n" , error);unlock_page (page); }
@@ -553,16 +555,15 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" -"%u db=%llu\n" , rc, lb, (unsigned long long )db); +pr_info ("journal mapping error %d: lb=%u db=%llu\n" , + rc, lb, (unsigned long long )db);break ; }if (!prev_db || db != prev_db +1 ) { jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " -"mapping journal extents.\n" ); +pr_info ("out of memory mapping journal extents\n" ); rc = -ENOMEM ;break ; }
@@ -1006,7 +1007,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -pr_info ("GFS2: can't find protocol %s\n" , proto); +pr_info ("can't find protocol %s\n" , proto);return -ENOENT ; }
@@ -1113,7 +1114,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;
@@ -1361,7 +1362,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -pr_warn ("GFS2: can't parse mount arguments\n" ); +pr_warn ("can't parse mount arguments\n" ); goto error_super; }
@@ -1411,15 +1412,15 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -pr_warn ("GFS2: path_lookup on %s returned error %d\n" , - dev_name, error); +pr_warn ("path_lookup on %s returned error %d\n" , + dev_name, error);return ERR_PTR (error); } s =sget (&gfs2_fs_type, test_gfs2_super, set_meta_super, flags, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -pr_warn ("GFS2: gfs2 mount does not exist\n" ); +pr_warn ("gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {
fs/gfs2/quota.c +6 -4
@@ -36,6 +36,8 @@* the quota file, so it is not being constantly read. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/mm.h>
@@ -1081,10 +1083,10 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -pr_info ("GFS2: fsid=%s: quota %s for %s %u\n" , - sdp->sd_fsname, type, - (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , -from_kqid (&init_user_ns, qd->qd_id)); +pr_info ("fsid=%s: quota %s for %s %u\n" , + sdp->sd_fsname, type, + (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , +from_kqid (&init_user_ns, qd->qd_id));return 0 ; }
fs/gfs2/rgrp.c +13 -11
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h>
@@ -99,12 +101,12 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " -"new_state=%d\n" , rbm->offset, cur_state, new_state); -pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , - (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , - bi->bi_offset, bi->bi_len); +pr_warn ("buf_blk = 0x%x old_state=%d, new_state=%d\n" , + rbm->offset, cur_state, new_state); +pr_warn ("rgrp=0x%llx bi_start=0x%x\n" , + (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); +pr_warn ("bi_offset=0x%x bi_len=0x%x\n" , + bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);return ;
@@ -736,11 +738,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -pr_info (" ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -pr_info (" ri_length = %u\n" , rgd->rd_length); -pr_info (" ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -pr_info (" ri_data = %u\n" , rgd->rd_data); -pr_info (" ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info ("ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info ("ri_length = %u\n" , rgd->rd_length); +pr_info ("ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info ("ri_data = %u\n" , rgd->rd_data); +pr_info ("ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/**
fs/gfs2/super.c +8 -8
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/bio.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -175,8 +177,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_debug =1 ;
@@ -228,21 +229,21 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -pr_warn ("GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("commit mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -pr_warn ("GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("statfs_quantum mount option requires a non-negative numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -pr_warn ("GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("quota_quantum mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;
@@ -259,8 +260,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_errors =GFS2_ERRORS_PANIC ;
@@ -279,7 +279,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -pr_warn ("GFS2: invalid mount option: %s\n" , o); +pr_warn ("invalid mount option: %s\n" , o);return -EINVAL ; } }
fs/gfs2/sys.c +2 -0
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/completion.h>
fs/gfs2/trans.c +10 -9
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -99,13 +101,13 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%u\n" , - tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , - tr->tr_num_buf_new, tr->tr_num_buf_rm, - tr->tr_num_databuf_new, tr->tr_num_databuf_rm, - tr->tr_num_revoke, tr->tr_num_revoke_rm); +pr_warn ("Transaction created at: %pSR\n" , (void *)tr->tr_ip); +pr_warn ("blocks=%u revokes=%u reserved=%u touched=%u\n" , + tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); +pr_warn ("Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , + tr->tr_num_buf_new, tr->tr_num_buf_rm, + tr->tr_num_databuf_new, tr->tr_num_databuf_rm, + tr->tr_num_revoke, tr->tr_num_revoke_rm); }void gfs2_trans_end (struct gfs2_sbd *sdp)
@@ -231,8 +233,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -pr_err ("Attempting to add uninitialised block to journal " -"(inplace block=%lld)\n" , +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG (); }
fs/gfs2/util.c +6 -6
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/spinlock.h> #include <linux/completion.h> #include <linux/buffer_head.h>
@@ -30,7 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -pr_emerg ("GFS2: fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); +pr_emerg ("fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }int gfs2_lm_withdraw (struct gfs2_sbd *sdp,char *fmt, ...)
@@ -65,7 +67,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) }if (sdp->sd_args.ar_errors ==GFS2_ERRORS_PANIC ) -panic ("GFS2: fsid=%s: panic requested.\n" , sdp->sd_fsname); +panic ("GFS2: fsid=%s: panic requested\n" , sdp->sd_fsname);return -1 ; }
@@ -104,10 +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 ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("fsid=%s: warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n" , + sdp->sd_fsname, assertion, function, file, line);if (sdp->sd_args.ar_debug)BUG ();
fs/gfs2/util.h +12 -13
@@ -10,22 +10,21 @@#ifndef __UTIL_DOT_H__#define __UTIL_DOT_H__ +#ifdef pr_fmt +#undef pr_fmt +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#endif +#include <linux/mempool.h> #include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - -#define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) - -#define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) - -#define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) - +#define fs_warn (fs, fmt, ...) \ + pr_warn("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_err (fs, fmt, ...) \ + pr_err("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_info (fs, fmt, ...) \ + pr_info("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)void gfs2_assert_i (struct gfs2_sbd *sdp);
@@ -85,7 +84,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 2/3 gfs2: Use fs_<level> more often
In reply to Fabian FrederickConvert a couple of uses of pr_<level> to fs_<level> Add and use fs_emerg.
Signed-off-by Joe Perches <[email protected]>
--- fs/gfs2/quota.c | 4 ++-- fs/gfs2/util.c | 6 +++--- fs/gfs2/util.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-)
fs/gfs2/quota.c +2 -2
@@ -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
@@ -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
@@ -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, ...) \
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 3/3 gfs2: Convert gfs2_lm_withdraw to use fs_err
In reply to Fabian Frederickvprintk use is not prefixed by a KERN_<LEVEL>,
so emit these messages at KERN_ERR level.
Using %pV can save some code and allow fs_err to
be used, so do it.
Signed-off-by Joe Perches <[email protected]>
--- fs/gfs2/sys.c | 4 +-- fs/gfs2/util.c | 87 ++++++++++++++++++++++++++++------------------------------ fs/gfs2/util.h | 4 +-- 3 files changed, 45 insertions(+), 50 deletions(-)
fs/gfs2/sys.c +1 -3
@@ -140,9 +140,7 @@ static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)if (simple_strtol (buf,NULL ,0 ) !=1 )return -EINVAL ; -gfs2_lm_withdraw (sdp, -"GFS2: fsid=%s: withdrawing from cluster at user's request\n" , - sdp->sd_fsname); +gfs2_lm_withdraw (sdp,"withdrawing from cluster at user's request\n" );return len; }
fs/gfs2/util.c +42 -45
151 lines not on this page · raw message
fs/gfs2/util.h +2 -2
@@ -165,7 +165,7 @@ static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,#define gfs2_tune_get (sdp, field) \ gfs2_tune_get_i(&(sdp)->sd_tune, &(sdp)->sd_tune.field) -int gfs2_lm_withdraw (struct gfs2_sbd *sdp,char *fmt, ...); +__printf(2, 3) +int gfs2_lm_withdraw (struct gfs2_sbd *sdp,const char *fmt, ...);#endif /* __UTIL_DOT_H__ */ -
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH v2 3/3 gfs2: Convert gfs2_lm_withdraw to use fs_err
vprintk use is not prefixed by a KERN_<LEVEL>,
so emit these messages at KERN_ERR level.
Using %pV can save some code and allow fs_err to
be used, so do it.
Signed-off-by Joe Perches <[email protected]>
---
V2: A bit more neatening and argument alignment.
fs/gfs2/sys.c | 5 ++-- fs/gfs2/util.c | 87 ++++++++++++++++++++++++++++------------------------------ fs/gfs2/util.h | 4 +-- 3 files changed, 46 insertions(+), 50 deletions(-)
fs/gfs2/sys.c +2 -3
@@ -140,9 +140,8 @@ static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)if (simple_strtol (buf,NULL ,0 ) !=1 )return -EINVAL ; -gfs2_lm_withdraw (sdp, -"GFS2: fsid=%s: withdrawing from cluster at user's request\n" , - sdp->sd_fsname); +gfs2_lm_withdraw (sdp,"withdrawing from cluster at user's request\n" ); +return len; }
fs/gfs2/util.c +42 -45
151 lines not on this page · raw message
fs/gfs2/util.h +2 -2
@@ -165,7 +165,7 @@ static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,#define gfs2_tune_get (sdp, field) \ gfs2_tune_get_i(&(sdp)->sd_tune, &(sdp)->sd_tune.field) -int gfs2_lm_withdraw (struct gfs2_sbd *sdp,char *fmt, ...); +__printf(2, 3) +int gfs2_lm_withdraw (struct gfs2_sbd *sdp,const char *fmt, ...);#endif /* __UTIL_DOT_H__ */ -
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Quoted 11 lines · Steven Whitehouse
Quoted 6 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.Signed-off-by Fabian Frederick <[email protected]>Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Fabian's patch had a few more changes.
The biggest benefit to pr_<level> is automatic prefixing with pr_fmt().
That wasn't done by Fabian's patch.
There were also printks that didn't have any "GFS2: " prefix at all.
Here's a proposal on top of what's applied.
This adds pr_fmt, converts the rest of the printks, removes the embedded "GFS2: " prefixes, and standardizes on "gfs2: " as the prefix.
It also does a few conversions of embedded function names to "%s: ", __func__
Dunno if that "GFS2:" -> "gfs2: " is a good thing, but at least it's consistent.
unsigned...
--- fs/gfs2/dir.c | 14 ++++++++------ fs/gfs2/glock.c | 20 +++++++++++--------- fs/gfs2/lock_dlm.c | 9 ++++++--- fs/gfs2/main.c | 4 +++- fs/gfs2/ops_fstype.c | 25 +++++++++++++------------ fs/gfs2/quota.c | 10 ++++++---- fs/gfs2/rgrp.c | 24 +++++++++++++----------- fs/gfs2/super.c | 16 ++++++++-------- fs/gfs2/sys.c | 2 ++ fs/gfs2/trans.c | 19 ++++++++++--------- fs/gfs2/util.c | 13 ++++++------- fs/gfs2/util.h | 25 ++++++++++++------------- 12 files changed, 98 insertions(+), 83 deletions(-)
fs/gfs2/dir.c +8 -6
@@ -53,6 +53,8 @@* but never before the maximum hash table size has been reached. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/buffer_head.h>
@@ -507,8 +509,8 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, - first ?"first in block" :"not first in block" ); +pr_warn ("%s: %s (%s)\n" , + __func__, msg, first ?"first in block" :"not first in block" );return -EIO ; }
@@ -531,8 +533,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -pr_warn ("gfs2_scan_dirent: wrong block type %u\n" , -be32_to_cpu (h->mh_type)); +pr_warn ("%s: wrong block type %u\n" , __func__,be32_to_cpu (h->mh_type));return -1 ; }
@@ -728,7 +729,7 @@ static int get_leaf(struct gfs2_inode *dip, u64 leaf_no, error =gfs2_meta_read (dip->i_gl, leaf_no,DIO_WAIT , bhp);if (!error &&gfs2_metatype_check (GFS2_SB (&dip->i_inode), *bhp,GFS2_METATYPE_LF )) { -/* printk(KERN_INFO "block num=%llu\n", leaf_no); */ +/* pr_info("block num=%llu\n", leaf_no); */ error = -EIO ; }
@@ -1006,7 +1007,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , + dip->i_depth,be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;
fs/gfs2/glock.c +11 -9
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -468,7 +470,7 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("wanted %u got %u\n" , gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);
@@ -542,7 +544,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */
@@ -935,7 +937,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err ("%pV" , &vaf); }va_end (args);
@@ -1010,13 +1012,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();
fs/gfs2/lock_dlm.c +6 -3
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/fs.h> #include <linux/dlm.h> #include <linux/slab.h>
@@ -176,7 +178,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -pr_err ("unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d\n" , mode);BUG (); } }
@@ -195,7 +197,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -pr_err ("unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d\n" , lmstate);BUG ();return -1 ; }
@@ -308,7 +310,8 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, +pr_err ("gdlm_unlock %x,%llx err=%d\n" , + gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ; }
fs/gfs2/main.c +3 -1
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h>
@@ -165,7 +167,7 @@ static int __init init_gfs2_fs(void)gfs2_register_debugfs (); -printk ("GFS2 installed\n" ); +pr_info ("GFS2 installed\n" );return 0 ;
fs/gfs2/ops_fstype.c +13 -12
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -152,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -pr_warn ("GFS2: not a GFS2 filesystem\n" ); +pr_warn ("not a GFS2 filesystem\n" );return -EINVAL ; }
@@ -174,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -pr_warn ("gfs2: error %d reading superblock\n" , error); +pr_warn ("error %d reading superblock\n" , error);unlock_page (page); }
@@ -553,16 +555,15 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" -"%u db=%llu\n" , rc, lb, (unsigned long long )db); +pr_info ("journal mapping error %d: lb=%u db=%llu\n" , + rc, lb, (unsigned long long )db);break ; }if (!prev_db || db != prev_db +1 ) { jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " -"mapping journal extents.\n" ); +pr_info ("out of memory mapping journal extents\n" ); rc = -ENOMEM ;break ; }
@@ -1006,7 +1007,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -pr_info ("GFS2: can't find protocol %s\n" , proto); +pr_info ("can't find protocol %s\n" , proto);return -ENOENT ; }
@@ -1113,7 +1114,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;
@@ -1361,7 +1362,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -pr_warn ("GFS2: can't parse mount arguments\n" ); +pr_warn ("can't parse mount arguments\n" ); goto error_super; }
@@ -1411,15 +1412,15 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -pr_warn ("GFS2: path_lookup on %s returned error %d\n" , - dev_name, error); +pr_warn ("path_lookup on %s returned error %d\n" , + dev_name, error);return ERR_PTR (error); } s =sget (&gfs2_fs_type, test_gfs2_super, set_meta_super, flags, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -pr_warn ("GFS2: gfs2 mount does not exist\n" ); +pr_warn ("gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {
fs/gfs2/quota.c +6 -4
@@ -36,6 +36,8 @@* the quota file, so it is not being constantly read. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/mm.h>
@@ -1081,10 +1083,10 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , - sdp->sd_fsname, type, - (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , -from_kqid (&init_user_ns, qd->qd_id)); +pr_info ("fsid=%s: quota %s for %s %u\n" , + sdp->sd_fsname, type, + (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , +from_kqid (&init_user_ns, qd->qd_id));return 0 ; }
fs/gfs2/rgrp.c +13 -11
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h>
@@ -99,12 +101,12 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " -"new_state=%d\n" , rbm->offset, cur_state, new_state); -pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , - (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , - bi->bi_offset, bi->bi_len); +pr_warn ("buf_blk = 0x%x old_state=%d, new_state=%d\n" , + rbm->offset, cur_state, new_state); +pr_warn ("rgrp=0x%llx bi_start=0x%x\n" , + (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); +pr_warn ("bi_offset=0x%x bi_len=0x%x\n" , + bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);return ;
@@ -736,11 +738,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info ("ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info ("ri_length = %u\n" , rgd->rd_length); +pr_info ("ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info ("ri_data = %u\n" , rgd->rd_data); +pr_info ("ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/**
fs/gfs2/super.c +8 -8
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/bio.h> #include <linux/sched.h> #include <linux/slab.h>
@@ -175,8 +177,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_debug =1 ;
@@ -228,21 +229,21 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -pr_warn ("GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("commit mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -pr_warn ("GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("statfs_quantum mount option requires a non-negative numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -pr_warn ("GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("quota_quantum mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;
@@ -259,8 +260,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_errors =GFS2_ERRORS_PANIC ;
@@ -279,7 +279,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -pr_warn ("GFS2: invalid mount option: %s\n" , o); +pr_warn ("invalid mount option: %s\n" , o);return -EINVAL ; } }
fs/gfs2/sys.c +2 -0
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/completion.h>
fs/gfs2/trans.c +10 -9
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -99,13 +101,13 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%u\n" , - tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , - tr->tr_num_buf_new, tr->tr_num_buf_rm, - tr->tr_num_databuf_new, tr->tr_num_databuf_rm, - tr->tr_num_revoke, tr->tr_num_revoke_rm); +pr_warn ("Transaction created at: %pSR\n" , (void *)tr->tr_ip); +pr_warn ("blocks=%u revokes=%u reserved=%u touched=%u\n" , + tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); +pr_warn ("Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , + tr->tr_num_buf_new, tr->tr_num_buf_rm, + tr->tr_num_databuf_new, tr->tr_num_databuf_rm, + tr->tr_num_revoke, tr->tr_num_revoke_rm); }void gfs2_trans_end (struct gfs2_sbd *sdp)
@@ -231,8 +233,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -pr_err ("Attempting to add uninitialised block to journal " -"(inplace block=%lld)\n" , +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG (); }
fs/gfs2/util.c +6 -7
@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/spinlock.h> #include <linux/completion.h> #include <linux/buffer_head.h>
@@ -30,8 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , - sdp->sd_fsname); +pr_emerg ("fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }int gfs2_lm_withdraw (struct gfs2_sbd *sdp,char *fmt, ...)
@@ -66,7 +67,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) }if (sdp->sd_args.ar_errors ==GFS2_ERRORS_PANIC ) -panic ("GFS2: fsid=%s: panic requested.\n" , sdp->sd_fsname); +panic ("GFS2: fsid=%s: panic requested\n" , sdp->sd_fsname);return -1 ; }
@@ -105,10 +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 ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("fsid=%s: warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n" , + sdp->sd_fsname, assertion, function, file, line);if (sdp->sd_args.ar_debug)BUG ();
fs/gfs2/util.h +12 -13
@@ -10,22 +10,21 @@#ifndef __UTIL_DOT_H__#define __UTIL_DOT_H__ +#ifdef pr_fmt +#undef pr_fmt +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#endif +#include <linux/mempool.h> #include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - -#define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) - -#define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) - -#define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) - +#define fs_warn (fs, fmt, ...) \ + pr_warn("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_err (fs, fmt, ...) \ + pr_err("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_info (fs, fmt, ...) \ + pr_info("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)void gfs2_assert_i (struct gfs2_sbd *sdp);
@@ -85,7 +84,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Hi,
Quoted 15 lines · Joe Perches
Quoted 11 lines · Steven Whitehouse
Quoted 6 lines · Fabian Frederick
(quoted diff) +0
-4-All printk(KERN_foo converted to pr_foo(). -Messages updated to fit in 80 columns. -fs_macros converted as well. -fs_printk removed.Signed-off-by Fabian Frederick <[email protected]>Due to various other patches, this didn't apply directly, so I've fixed it up by hand. I have pushed it to the -nmw tree, so please do take a look and check that I didn't miss anything. Thanks,
Fabian's patch had a few more changes.
Quoted 8 lines
The biggest benefit to pr_<level> is automatic prefixing with
pr_fmt().That wasn't done by Fabian's patch.
There were also printks that didn't have any "GFS2: " prefix at all.
Ok, I think I've got all of Fabian's patch now. Can you send me an updated patch that I can put into my tree based on top of whats in the -nmw tree now? Otherwise I think things will be a bit too confusing,
Steve.
Quoted 596 lines
Here's a proposal on top of what's applied.
This adds
pr_fmt, converts the rest of the printks, removes the embedded "GFS2: " prefixes, and standardizes on "gfs2: " as the prefix.It also does a few conversions of embedded function names to "%s: ",
__func__Dunno if that "GFS2:" -> "gfs2: " is a good thing, but at least it's consistent.
unsigned...
--- fs/gfs2/dir.c | 14 ++++++++------ fs/gfs2/glock.c | 20 +++++++++++--------- fs/gfs2/lock_dlm.c | 9 ++++++--- fs/gfs2/main.c | 4 +++- fs/gfs2/ops_fstype.c | 25 +++++++++++++------------ fs/gfs2/quota.c | 10 ++++++---- fs/gfs2/rgrp.c | 24 +++++++++++++----------- fs/gfs2/super.c | 16 ++++++++-------- fs/gfs2/sys.c | 2 ++ fs/gfs2/trans.c | 19 ++++++++++--------- fs/gfs2/util.c | 13 ++++++------- fs/gfs2/util.h | 25 ++++++++++++------------- 12 files changed, 98 insertions(+), 83 deletions(-)fs/gfs2/dir.c +8
-6@@ -53,6 +53,8 @@* but never before the maximum hash table size has been reached. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/buffer_head.h> @@ -507,8 +509,8 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, goto error;return 0 ; error: -pr_warn ("gfs2_check_dirent: %s (%s)\n" , msg, - first ?"first in block" :"not first in block" ); +pr_warn ("%s: %s (%s)\n" , + __func__, msg, first ?"first in block" :"not first in block" );return -EIO ; }@@ -531,8 +533,7 @@ static int gfs2_dirent_offset(const void *buf) }return offset; wrong_type: -pr_warn ("gfs2_scan_dirent: wrong block type %u\n" , -be32_to_cpu (h->mh_type)); +pr_warn ("%s: wrong block type %u\n" , __func__,be32_to_cpu (h->mh_type));return -1 ; }@@ -728,7 +729,7 @@ static int get_leaf(struct gfs2_inode *dip, u64 leaf_no, error =gfs2_meta_read (dip->i_gl, leaf_no,DIO_WAIT , bhp);if (!error &&gfs2_metatype_check (GFS2_SB (&dip->i_inode), *bhp,GFS2_METATYPE_LF )) { -/* printk(KERN_INFO "block num=%llu\n", leaf_no); */ +/* pr_info("block num=%llu\n", leaf_no); */ error = -EIO ; }@@ -1006,7 +1007,8 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) len =1 << (dip->i_depth -be16_to_cpu (oleaf->lf_depth)); half_len = len >>1 ;if (!half_len) { -pr_warn ("i_depth %u lf_depth %u index %u\n" , dip->i_depth,be16_to_cpu (oleaf->lf_depth), index); +pr_warn ("i_depth %u lf_depth %u index %u\n" , + dip->i_depth,be16_to_cpu (oleaf->lf_depth), index);gfs2_consist_inode (dip); error = -EIO ; goto fail_brelse;fs/gfs2/glock.c +11
-9@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -468,7 +470,7 @@ retry:do_xmote (gl, gh,LM_ST_UNLOCKED );break ;default :/* Everything else */ -printk (KERN_ERR "GFS2: wanted %u got %u\n" , gl->gl_target, state); +pr_err ("wanted %u got %u\n" , gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); }spin_unlock (&gl->gl_spin);@@ -542,7 +544,7 @@ __acquires(&gl->gl_spin)/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret) { -printk (KERN_ERR "GFS2: lm_lock ret %d\n" , ret); +pr_err ("lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl,1 ); } }else {/* lock_nolock */ @@ -935,7 +937,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -printk (KERN_ERR " %pV" , &vaf); +pr_err ("%pV" , &vaf); }va_end (args);@@ -1010,13 +1012,13 @@ do_cancel:return ; trap_recursive: -printk (KERN_ERR "original: %pSR\n" , (void *)gh2->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("original: %pSR\n" , (void *)gh2->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh2->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh2->gh_gl->gl_name.ln_type, gh2->gh_state); -printk (KERN_ERR "new: %pSR\n" , (void *)gh->gh_ip); -printk (KERN_ERR "pid: %d\n" ,pid_nr (gh->gh_owner_pid)); -printk (KERN_ERR "lock type: %d req lock state : %d\n" , +pr_err ("new: %pSR\n" , (void *)gh->gh_ip); +pr_err ("pid: %d\n" ,pid_nr (gh->gh_owner_pid)); +pr_err ("lock type: %d req lock state : %d\n" , gh->gh_gl->gl_name.ln_type, gh->gh_state);gfs2_dump_glock (NULL , gl);BUG ();fs/gfs2/lock_dlm.c +6
-3@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/fs.h> #include <linux/dlm.h> #include <linux/slab.h> @@ -176,7 +178,7 @@ static void gdlm_bast(void *arg, int mode)gfs2_glock_cb (gl,LM_ST_SHARED );break ;default : -pr_err ("unknown bast mode %d" , mode); +pr_err ("unknown bast mode %d\n" , mode);BUG (); } }@@ -195,7 +197,7 @@ static int make_mode(const unsigned int lmstate)case LM_ST_SHARED :return DLM_LOCK_PR ; } -pr_err ("unknown LM state %d" , lmstate); +pr_err ("unknown LM state %d\n" , lmstate);BUG ();return -1 ; }@@ -308,7 +310,8 @@ static void gdlm_put_lock(struct gfs2_glock *gl) error =dlm_unlock (ls->ls_dlm, gl->gl_lksb.sb_lkid,DLM_LKF_VALBLK ,NULL , gl);if (error) { -pr_err ("gdlm_unlock %x,%llx err=%d\n" , gl->gl_name.ln_type, +pr_err ("gdlm_unlock %x,%llx err=%d\n" , + gl->gl_name.ln_type, (unsigned long long )gl->gl_name.ln_number, error);return ; }fs/gfs2/main.c +3
-1@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h> @@ -165,7 +167,7 @@ static int __init init_gfs2_fs(void)gfs2_register_debugfs (); -printk ("GFS2 installed\n" ); +pr_info ("GFS2 installed\n" );return 0 ;fs/gfs2/ops_fstype.c +13
-12@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -152,7 +154,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)if (sb->sb_magic !=GFS2_MAGIC || sb->sb_type !=GFS2_METATYPE_SB ) {if (!silent) -pr_warn ("GFS2: not a GFS2 filesystem\n" ); +pr_warn ("not a GFS2 filesystem\n" );return -EINVAL ; }@@ -174,7 +176,7 @@ static void end_bio_io_page(struct bio *bio, int error)if (!error)SetPageUptodate (page);else -pr_warn ("gfs2: error %d reading superblock\n" , error); +pr_warn ("error %d reading superblock\n" , error);unlock_page (page); }@@ -553,16 +555,15 @@ static int map_journal_extents(struct gfs2_sbd *sdp) rc =gfs2_block_map (jd->jd_inode, lb, &bh,0 ); db = bh.b_blocknr;if (rc || !db) { -printk (KERN_INFO "GFS2 journal mapping error %d: lb=" -"%u db=%llu\n" , rc, lb, (unsigned long long )db); +pr_info ("journal mapping error %d: lb=%u db=%llu\n" , + rc, lb, (unsigned long long )db);break ; }if (!prev_db || db != prev_db +1 ) { jext =kzalloc (sizeof (struct gfs2_journal_extent ),GFP_KERNEL );if (!jext) { -printk (KERN_INFO "GFS2 error: out of memory " -"mapping journal extents.\n" ); +pr_info ("out of memory mapping journal extents\n" ); rc = -ENOMEM ;break ; }@@ -1006,7 +1007,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) lm = &gfs2_dlm_ops;#endif }else { -pr_info ("GFS2: can't find protocol %s\n" , proto); +pr_info ("can't find protocol %s\n" , proto);return -ENOENT ; }@@ -1113,7 +1114,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent sdp =init_sbd (sb);if (!sdp) { -pr_warn ("GFS2: can't alloc struct gfs2_sbd\n" ); +pr_warn ("can't alloc struct gfs2_sbd\n" );return -ENOMEM ; } sdp->sd_args = *args;@@ -1361,7 +1362,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, error =gfs2_mount_args (&args, data);if (error) { -pr_warn ("GFS2: can't parse mount arguments\n" ); +pr_warn ("can't parse mount arguments\n" ); goto error_super; }@@ -1411,15 +1412,15 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, error =kern_path (dev_name,LOOKUP_FOLLOW , &path);if (error) { -pr_warn ("GFS2: path_lookup on %s returned error %d\n" , - dev_name, error); +pr_warn ("path_lookup on %s returned error %d\n" , + dev_name, error);return ERR_PTR (error); } s =sget (&gfs2_fs_type, test_gfs2_super, set_meta_super, flags, path.dentry->d_inode->i_sb->s_bdev);path_put (&path);if (IS_ERR (s)) { -pr_warn ("GFS2: gfs2 mount does not exist\n" ); +pr_warn ("gfs2 mount does not exist\n" );return ERR_CAST (s); }if ((flags ^ s->s_flags) &MS_RDONLY ) {fs/gfs2/quota.c +6
-4@@ -36,6 +36,8 @@* the quota file, so it is not being constantly read. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/mm.h> @@ -1081,10 +1083,10 @@ static int print_message(struct gfs2_quota_data *qd, char *type) {struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd; -printk (KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\n" , - sdp->sd_fsname, type, - (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , -from_kqid (&init_user_ns, qd->qd_id)); +pr_info ("fsid=%s: quota %s for %s %u\n" , + sdp->sd_fsname, type, + (qd->qd_id.type ==USRQUOTA ) ?"user" :"group" , +from_kqid (&init_user_ns, qd->qd_id));return 0 ; }fs/gfs2/rgrp.c +13
-11@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/completion.h> @@ -99,12 +101,12 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, cur_state = (*byte1 >> bit) &GFS2_BIT_MASK ;if (unlikely (!valid_change[new_state *4 + cur_state])) { -pr_warn ("GFS2: buf_blk = 0x%x old_state=%d, " -"new_state=%d\n" , rbm->offset, cur_state, new_state); -pr_warn ("GFS2: rgrp=0x%llx bi_start=0x%x\n" , - (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); -pr_warn ("GFS2: bi_offset=0x%x bi_len=0x%x\n" , - bi->bi_offset, bi->bi_len); +pr_warn ("buf_blk = 0x%x old_state=%d, new_state=%d\n" , + rbm->offset, cur_state, new_state); +pr_warn ("rgrp=0x%llx bi_start=0x%x\n" , + (unsigned long long )rbm->rgd->rd_addr, bi->bi_start); +pr_warn ("bi_offset=0x%x bi_len=0x%x\n" , + bi->bi_offset, bi->bi_len);dump_stack ();gfs2_consist_rgrpd (rbm->rgd);return ;@@ -736,11 +738,11 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)static void gfs2_rindex_print (const struct gfs2_rgrpd *rgd) { -printk (KERN_INFO " ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); -printk (KERN_INFO " ri_length = %u\n" , rgd->rd_length); -printk (KERN_INFO " ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); -printk (KERN_INFO " ri_data = %u\n" , rgd->rd_data); -printk (KERN_INFO " ri_bitbytes = %u\n" , rgd->rd_bitbytes); +pr_info ("ri_addr = %llu\n" , (unsigned long long )rgd->rd_addr); +pr_info ("ri_length = %u\n" , rgd->rd_length); +pr_info ("ri_data0 = %llu\n" , (unsigned long long )rgd->rd_data0); +pr_info ("ri_data = %u\n" , rgd->rd_data); +pr_info ("ri_bitbytes = %u\n" , rgd->rd_bitbytes); }/** fs/gfs2/super.c +8
-8@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/bio.h> #include <linux/sched.h> #include <linux/slab.h> @@ -175,8 +177,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_debug:if (args->ar_errors ==GFS2_ERRORS_PANIC ) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_debug =1 ;@@ -228,21 +229,21 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)case Opt_commit: rv =match_int (&tmp[0 ], &args->ar_commit);if (rv || args->ar_commit <=0 ) { -pr_warn ("GFS2: commit mount option requires a positive numeric argument\n" ); +pr_warn ("commit mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_statfs_quantum: rv =match_int (&tmp[0 ], &args->ar_statfs_quantum);if (rv || args->ar_statfs_quantum <0 ) { -pr_warn ("GFS2: statfs_quantum mount option requires a non-negative numeric argument\n" ); +pr_warn ("statfs_quantum mount option requires a non-negative numeric argument\n" );return rv ? rv : -EINVAL ; }break ;case Opt_quota_quantum: rv =match_int (&tmp[0 ], &args->ar_quota_quantum);if (rv || args->ar_quota_quantum <=0 ) { -pr_warn ("GFS2: quota_quantum mount option requires a positive numeric argument\n" ); +pr_warn ("quota_quantum mount option requires a positive numeric argument\n" );return rv ? rv : -EINVAL ; }break ;@@ -259,8 +260,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_err_panic:if (args->ar_debug) { -pr_warn ("GFS2: -o debug and -o errors=panic " -"are mutually exclusive.\n" ); +pr_warn ("-o debug and -o errors=panic are mutually exclusive\n" );return -EINVAL ; } args->ar_errors =GFS2_ERRORS_PANIC ;@@ -279,7 +279,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)break ;case Opt_error:default : -pr_warn ("GFS2: invalid mount option: %s\n" , o); +pr_warn ("invalid mount option: %s\n" , o);return -EINVAL ; } }fs/gfs2/sys.c +2
-0@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/completion.h> fs/gfs2/trans.c +10
-9@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/sched.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -99,13 +101,13 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)static void gfs2_print_trans (const struct gfs2_trans *tr) { -pr_warn ("GFS2: Transaction created at: %pSR\n" , (void *)tr->tr_ip); -pr_warn ("GFS2: blocks=%u revokes=%u reserved=%u touched=%u\n" , - tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); -pr_warn ("GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , - tr->tr_num_buf_new, tr->tr_num_buf_rm, - tr->tr_num_databuf_new, tr->tr_num_databuf_rm, - tr->tr_num_revoke, tr->tr_num_revoke_rm); +pr_warn ("Transaction created at: %pSR\n" , (void *)tr->tr_ip); +pr_warn ("blocks=%u revokes=%u reserved=%u touched=%u\n" , + tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); +pr_warn ("Buf %u/%u Databuf %u/%u Revoke %u/%u\n" , + tr->tr_num_buf_new, tr->tr_num_buf_rm, + tr->tr_num_databuf_new, tr->tr_num_databuf_rm, + tr->tr_num_revoke, tr->tr_num_revoke_rm); }void gfs2_trans_end (struct gfs2_sbd *sdp)@@ -231,8 +233,7 @@ static void meta_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)set_bit (GLF_DIRTY , &bd->bd_gl->gl_flags); mh = (struct gfs2_meta_header *)bd->bd_bh->b_data;if (unlikely (mh->mh_magic !=cpu_to_be32 (GFS2_MAGIC ))) { -pr_err ("Attempting to add uninitialised block to journal " -"(inplace block=%lld)\n" , +pr_err ("Attempting to add uninitialised block to journal (inplace block=%lld)\n" , (unsigned long long )bd->bd_bh->b_blocknr);BUG (); }fs/gfs2/util.c +6
-7@@ -7,6 +7,8 @@* of the GNU General Public License version 2. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/spinlock.h> #include <linux/completion.h> #include <linux/buffer_head.h> @@ -30,8 +32,7 @@ mempool_t *gfs2_page_pool __read_mostly;void gfs2_assert_i (struct gfs2_sbd *sdp) { -printk (KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n" , - sdp->sd_fsname); +pr_emerg ("fsid=%s: fatal assertion failed\n" , sdp->sd_fsname); }int gfs2_lm_withdraw (struct gfs2_sbd *sdp,char *fmt, ...)@@ -66,7 +67,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) }if (sdp->sd_args.ar_errors ==GFS2_ERRORS_PANIC ) -panic ("GFS2: fsid=%s: panic requested.\n" , sdp->sd_fsname); +panic ("GFS2: fsid=%s: panic requested\n" , sdp->sd_fsname);return -1 ; }@@ -105,10 +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 ("GFS2: fsid=%s: warning: assertion \"%s\" failed\n" -"GFS2: fsid=%s: function = %s, file = %s, line = %u\n" , - sdp->sd_fsname, assertion, - sdp->sd_fsname, function, file, line); +pr_warn ("fsid=%s: warning: assertion \"%s\" failed at function = %s, file = %s, line = %u\n" , + sdp->sd_fsname, assertion, function, file, line);if (sdp->sd_args.ar_debug)BUG ();fs/gfs2/util.h +12
-13@@ -10,22 +10,21 @@#ifndef __UTIL_DOT_H__#define __UTIL_DOT_H__ +#ifdef pr_fmt +#undef pr_fmt +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#endif +#include <linux/mempool.h> #include "incore.h" -#define fs_printk(level, fs, fmt, arg...) \ - printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg) - -#define fs_info(fs, fmt, arg...) \ - fs_printk(KERN_INFO , fs , fmt , ## arg) - -#define fs_warn(fs, fmt, arg...) \ - fs_printk(KERN_WARNING , fs , fmt , ## arg) - -#define fs_err(fs, fmt, arg...) \ - fs_printk(KERN_ERR, fs , fmt , ## arg) - +#define fs_warn (fs, fmt, ...) \ + pr_warn("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_err (fs, fmt, ...) \ + pr_err("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__) +#define fs_info (fs, fmt, ...) \ + pr_info("fsid=%s: " fmt, (fs)->sd_fsname, ##__VA_ARGS__)void gfs2_assert_i (struct gfs2_sbd *sdp);@@ -85,7 +84,7 @@ static inline int gfs2_meta_check(struct gfs2_sbd *sdp,struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;u32 magic =be32_to_cpu (mh->mh_magic);if (unlikely (magic !=GFS2_MAGIC )) { -printk (KERN_ERR "GFS2: Magic number missing at %llu\n" , +pr_err ("Magic number missing at %llu\n" , (unsigned long long )bh->b_blocknr);return -EIO ; }
Quoted 3 lines · Steven Whitehouse
Ok, I think I've got all of Fabian's patch now. Can you send me an updated patch that I can put into my tree based on top of whats in the -nmw tree now? Otherwise I think things will be a bit too confusing,
No worries, but maybe you need to push the change? As far as I can tell, what's there now is the same.