jfs: Update jfs_error

Use a more current logging style.

Add __printf format and argument verification.

Remove embedded function names from formats.
Add %pf, __builtin_return_address(0) to jfs_error.
Add newlines to formats for kernel style consistency.
(One format already had an erroneous newline)
Coalesce formats and align arguments.

Object size reduced ~1KiB.

$ size fs/jfs/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 201891	  35488	  63936	 301315	  49903	fs/jfs/built-in.o.new
 202821	  35488	  64192	 302501	  49da5	fs/jfs/built-in.o.old

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

1 files changed, 18 insertions, 19 deletions

diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 0ddbeceafc62..c89424e71a0a 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -124,21 +124,21 @@ struct dtsplit {
 #define DT_PAGE(IP, MP) BT_PAGE(IP, MP, dtpage_t, i_dtroot)
 
 /* get page buffer for specified block address */
-#define DT_GETPAGE(IP, BN, MP, SIZE, P, RC)\
-{\
-        BT_GETPAGE(IP, BN, MP, dtpage_t, SIZE, P, RC, i_dtroot)\
-        if (!(RC))\
-        {\
-                if (((P)->header.nextindex > (((BN)==0)?DTROOTMAXSLOT:(P)->header.maxslot)) ||\
-                    ((BN) && ((P)->header.maxslot > DTPAGEMAXSLOT)))\
-                {\
-                        BT_PUTPAGE(MP);\
-                        jfs_error((IP)->i_sb, "DT_GETPAGE: dtree page corrupt");\
-                        MP = NULL;\
-                        RC = -EIO;\
-                }\
-        }\
-}
+#define DT_GETPAGE(IP, BN, MP, SIZE, P, RC)                             \
+do {                                                                    \
+        BT_GETPAGE(IP, BN, MP, dtpage_t, SIZE, P, RC, i_dtroot);        \
+        if (!(RC)) {                                                    \
+                if (((P)->header.nextindex >                            \
+                     (((BN) == 0) ? DTROOTMAXSLOT : (P)->header.maxslot)) || \
+                    ((BN) && ((P)->header.maxslot > DTPAGEMAXSLOT))) {  \
+                        BT_PUTPAGE(MP);                                 \
+                        jfs_error((IP)->i_sb,                           \
+                                  "DT_GETPAGE: dtree page corrupt\n");  \
+                        MP = NULL;                                      \
+                        RC = -EIO;                                      \
+                }                                                       \
+        }                                                               \
+} while (0)
 
 /* for consistency */
 #define DT_PUTPAGE(MP) BT_PUTPAGE(MP)
@@ -776,7 +776,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
                         /* Something's corrupted, mark filesystem dirty so
                          * chkdsk will fix it.
                          */
-                        jfs_error(sb, "stack overrun in dtSearch!");
+                        jfs_error(sb, "stack overrun!\n");
                         BT_STACK_DUMP(btstack);
                         rc = -EIO;
                         goto out;
@@ -3252,8 +3252,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                 /* Sanity Check */
                                 if (d_namleft == 0) {
                                         jfs_error(ip->i_sb,
-                                                  "JFS:Dtree error: ino = "
-                                                  "%ld, bn=%Ld, index = %d",
+                                                  "JFS:Dtree error: ino = %ld, bn=%lld, index = %d\n",
                                                   (long)ip->i_ino,
                                                   (long long)bn,
                                                   i);
@@ -3373,7 +3372,7 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack)
                  */
                 if (BT_STACK_FULL(btstack)) {
                         DT_PUTPAGE(mp);
-                        jfs_error(ip->i_sb, "dtReadFirst: btstack overrun");
+                        jfs_error(ip->i_sb, "btstack overrun\n");
                         BT_STACK_DUMP(btstack);
                         return -EIO;
                 }