aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-03-30 08:23:16 -0400
committerDave Kleikamp <dave.kleikamp@oracle.com>2016-03-30 11:48:03 -0400
commitb18db6de2ce2a6ca7f5da03701a2aa8c63b31b74 (patch)
tree99cc1a36bca76f5f074dfd3be1ce1a632282b113
parent1993b176a8224e371e0732ffada7ab9eb3b0912b (diff)
jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses
These macros add the newline so these cause extra blank lines in logging output. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
-rw-r--r--fs/jfs/jfs_inode.c2
-rw-r--r--fs/jfs/jfs_logmgr.c4
-rw-r--r--fs/jfs/jfs_txnmgr.c4
-rw-r--r--fs/jfs/super.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index cf7936fe2e68..5e33cb9a190d 100644
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -151,7 +151,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
151 jfs_inode->xtlid = 0; 151 jfs_inode->xtlid = 0;
152 jfs_set_inode_flags(inode); 152 jfs_set_inode_flags(inode);
153 153
154 jfs_info("ialloc returns inode = 0x%p\n", inode); 154 jfs_info("ialloc returns inode = 0x%p", inode);
155 155
156 return inode; 156 return inode;
157 157
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index a270cb7ff4e0..7638355addcc 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1094,7 +1094,7 @@ int lmLogOpen(struct super_block *sb)
1094 if (log->bdev->bd_dev == sbi->logdev) { 1094 if (log->bdev->bd_dev == sbi->logdev) {
1095 if (memcmp(log->uuid, sbi->loguuid, 1095 if (memcmp(log->uuid, sbi->loguuid,
1096 sizeof(log->uuid))) { 1096 sizeof(log->uuid))) {
1097 jfs_warn("wrong uuid on JFS journal\n"); 1097 jfs_warn("wrong uuid on JFS journal");
1098 mutex_unlock(&jfs_log_mutex); 1098 mutex_unlock(&jfs_log_mutex);
1099 return -EINVAL; 1099 return -EINVAL;
1100 } 1100 }
@@ -2136,7 +2136,7 @@ static void lbmStartIO(struct lbuf * bp)
2136 struct bio *bio; 2136 struct bio *bio;
2137 struct jfs_log *log = bp->l_log; 2137 struct jfs_log *log = bp->l_log;
2138 2138
2139 jfs_info("lbmStartIO\n"); 2139 jfs_info("lbmStartIO");
2140 2140
2141 bio = bio_alloc(GFP_NOFS, 1); 2141 bio = bio_alloc(GFP_NOFS, 1);
2142 bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); 2142 bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index d595856453b2..51421a84f45e 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1764,7 +1764,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
1764 if (lwm == next) 1764 if (lwm == next)
1765 goto out; 1765 goto out;
1766 if (lwm > next) { 1766 if (lwm > next) {
1767 jfs_err("xtLog: lwm > next\n"); 1767 jfs_err("xtLog: lwm > next");
1768 goto out; 1768 goto out;
1769 } 1769 }
1770 tlck->flag |= tlckUPDATEMAP; 1770 tlck->flag |= tlckUPDATEMAP;
@@ -2814,7 +2814,7 @@ int jfs_lazycommit(void *arg)
2814 if (!list_empty(&TxAnchor.unlock_queue)) 2814 if (!list_empty(&TxAnchor.unlock_queue))
2815 jfs_err("jfs_lazycommit being killed w/pending transactions!"); 2815 jfs_err("jfs_lazycommit being killed w/pending transactions!");
2816 else 2816 else
2817 jfs_info("jfs_lazycommit being killed\n"); 2817 jfs_info("jfs_lazycommit being killed");
2818 return 0; 2818 return 0;
2819} 2819}
2820 2820
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 4f5d85ba8e23..f908012b101a 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -84,7 +84,7 @@ static void jfs_handle_error(struct super_block *sb)
84 panic("JFS (device %s): panic forced after error\n", 84 panic("JFS (device %s): panic forced after error\n",
85 sb->s_id); 85 sb->s_id);
86 else if (sbi->flag & JFS_ERR_REMOUNT_RO) { 86 else if (sbi->flag & JFS_ERR_REMOUNT_RO) {
87 jfs_err("ERROR: (device %s): remounting filesystem as read-only\n", 87 jfs_err("ERROR: (device %s): remounting filesystem as read-only",
88 sb->s_id); 88 sb->s_id);
89 sb->s_flags |= MS_RDONLY; 89 sb->s_flags |= MS_RDONLY;
90 } 90 }
@@ -641,7 +641,7 @@ static int jfs_freeze(struct super_block *sb)
641 } 641 }
642 rc = updateSuper(sb, FM_CLEAN); 642 rc = updateSuper(sb, FM_CLEAN);
643 if (rc) { 643 if (rc) {
644 jfs_err("jfs_freeze: updateSuper failed\n"); 644 jfs_err("jfs_freeze: updateSuper failed");
645 /* 645 /*
646 * Don't fail here. Everything succeeded except 646 * Don't fail here. Everything succeeded except
647 * marking the superblock clean, so there's really 647 * marking the superblock clean, so there's really