jfs: Coalesce some formats

Formats are better kept as a single line for easier grep.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 9d9bae6..da1d021 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -102,8 +102,8 @@ int jfs_commit_inode(struct inode *inode, int wait)
                 * partitions and may think inode is dirty
                 */
                if (!special_file(inode->i_mode) && noisy) {
-                       jfs_err("jfs_commit_inode(0x%p) called on "
-                                  "read-only volume", inode);
+                       jfs_err("jfs_commit_inode(0x%p) called on read-only volume",
+                               inode);
                        jfs_err("Is remount racy?");
                        noisy--;
                }

diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index d88576e..de2bcb3 100644 (file)
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -3072,8 +3072,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)
                        }
                        if (dirtab_slot.flag == DIR_INDEX_FREE) {
                                if (loop_count++ > JFS_IP(ip)->next_index) {
-                                       jfs_err("jfs_readdir detected "
-                                                  "infinite loop!");
+                                       jfs_err("jfs_readdir detected infinite loop!");
                                        ctx->pos = DIREND;
                                        return 0;
                                }
@@ -3151,8 +3150,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)
                                if (!dir_emit(ctx, "..", 2, PARENT(ip), DT_DIR))
                                        return 0;
                        } else {
-                               jfs_err("jfs_readdir called with "
-                                       "invalid offset!");
+                               jfs_err("jfs_readdir called with invalid offset!");
                        }
                        dtoffset->pn = 1;
                        dtoffset->index = 0;
@@ -3165,8 +3163,8 @@ int jfs_readdir(struct file *file, struct dir_context *ctx)
                }
 
                if ((rc = dtReadNext(ip, &ctx->pos, &btstack))) {
-                       jfs_err("jfs_readdir: unexpected rc = %d "
-                               "from dtReadNext", rc);
+                       jfs_err("jfs_readdir: unexpected rc = %d from dtReadNext",
+                               rc);
                        ctx->pos = DIREND;
                        return 0;
                }

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index f321986..6aca224 100644 (file)
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -534,8 +534,7 @@ void diWriteSpecial(struct inode *ip, int secondary)
        /* read the page of fixed disk inode (AIT) in raw mode */
        mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1);
        if (mp == NULL) {
-               jfs_err("diWriteSpecial: failed to read aggregate inode "
-                       "extent!");
+               jfs_err("diWriteSpecial: failed to read aggregate inode extent!");
                return;
        }
 

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 7638355..63759d7 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1333,9 +1333,8 @@ int lmLogInit(struct jfs_log * log)
                                rc = -EINVAL;
                                goto errout20;
                        }
-                       jfs_info("lmLogInit: inline log:0x%p base:0x%Lx "
-                                "size:0x%x", log,
-                                (unsigned long long) log->base, log->size);
+                       jfs_info("lmLogInit: inline log:0x%p base:0x%Lx size:0x%x",
+                                log, (unsigned long long)log->base, log->size);
                } else {
                        if (memcmp(logsuper->uuid, log->uuid, 16)) {
                                jfs_warn("wrong uuid on JFS log device");
@@ -1343,9 +1342,8 @@ int lmLogInit(struct jfs_log * log)
                        }
                        log->size = le32_to_cpu(logsuper->size);
                        log->l2bsize = le32_to_cpu(logsuper->l2bsize);
-                       jfs_info("lmLogInit: external log:0x%p base:0x%Lx "
-                                "size:0x%x", log,
-                                (unsigned long long) log->base, log->size);
+                       jfs_info("lmLogInit: external log:0x%p base:0x%Lx size:0x%x",
+                                log, (unsigned long long)log->base, log->size);
                }
 
                log->page = le32_to_cpu(logsuper->end) / LOGPSIZE;

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 51421a8..eddf2b6 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1798,8 +1798,8 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                        xadlock->xdlist = &p->xad[lwm];
                        tblk->xflag &= ~COMMIT_LAZY;
                }
-               jfs_info("xtLog: alloc ip:0x%p mp:0x%p tlck:0x%p lwm:%d "
-                        "count:%d", tlck->ip, mp, tlck, lwm, xadlock->count);
+               jfs_info("xtLog: alloc ip:0x%p mp:0x%p tlck:0x%p lwm:%d count:%d",
+                        tlck->ip, mp, tlck, lwm, xadlock->count);
 
                maplock->index = 1;
 
@@ -2025,8 +2025,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                        xadlock->count = next - lwm;
                        xadlock->xdlist = &p->xad[lwm];
 
-                       jfs_info("xtLog: alloc ip:0x%p mp:0x%p count:%d "
-                                "lwm:%d next:%d",
+                       jfs_info("xtLog: alloc ip:0x%p mp:0x%p count:%d lwm:%d next:%d",
                                 tlck->ip, mp, xadlock->count, lwm, next);
                        maplock->index++;
                        xadlock++;
@@ -2047,8 +2046,8 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                        pxdlock->count = 1;
                        pxdlock->pxd = pxd;
 
-                       jfs_info("xtLog: truncate ip:0x%p mp:0x%p count:%d "
-                                "hwm:%d", ip, mp, pxdlock->count, hwm);
+                       jfs_info("xtLog: truncate ip:0x%p mp:0x%p count:%d hwm:%d",
+                                ip, mp, pxdlock->count, hwm);
                        maplock->index++;
                        xadlock++;
                }
@@ -2066,8 +2065,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
                        xadlock->count = hwm - next + 1;
                        xadlock->xdlist = &p->xad[next];
 
-                       jfs_info("xtLog: free ip:0x%p mp:0x%p count:%d "
-                                "next:%d hwm:%d",
+                       jfs_info("xtLog: free ip:0x%p mp:0x%p count:%d next:%d hwm:%d",
                                 tlck->ip, mp, xadlock->count, next, hwm);
                        maplock->index++;
                }
@@ -2523,8 +2521,7 @@ void txFreeMap(struct inode *ip,
                                        xlen = lengthXAD(xad);
                                        dbUpdatePMap(ipbmap, true, xaddr,
                                                     (s64) xlen, tblk);
-                                       jfs_info("freePMap: xaddr:0x%lx "
-                                                "xlen:%d",
+                                       jfs_info("freePMap: xaddr:0x%lx xlen:%d",
                                                 (ulong) xaddr, xlen);
                                }
                        }

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 701f893..211796a 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1225,8 +1225,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                rc = dtSearch(new_dir, &new_dname, &ino, &btstack,
                              JFS_CREATE);
                if (rc) {
-                       jfs_err("jfs_rename didn't expect dtSearch to fail "
-                               "w/rc = %d", rc);
+                       jfs_err("jfs_rename didn't expect dtSearch to fail w/rc = %d",
+                               rc);
                        goto out_tx;
                }