Merge tag 'usb-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / fs / jfs / jfs_xtree.c

diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 6c50871e62203d3bd9fd81d7c5cde22cfd3f75b4..5ad7748860ce6ceaea7d6f02d689484efcf34cd0 100644 (file)
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -64,22 +64,23 @@
 
 /* get page buffer for specified block address */
 /* ToDo: Replace this ugly macro with a function */
-#define XT_GETPAGE(IP, BN, MP, SIZE, P, RC)\
-{\
-       BT_GETPAGE(IP, BN, MP, xtpage_t, SIZE, P, RC, i_xtroot)\
-       if (!(RC))\
-       {\
-               if ((le16_to_cpu((P)->header.nextindex) < XTENTRYSTART) ||\
-                   (le16_to_cpu((P)->header.nextindex) > le16_to_cpu((P)->header.maxentry)) ||\
-                   (le16_to_cpu((P)->header.maxentry) > (((BN)==0)?XTROOTMAXSLOT:PSIZE>>L2XTSLOTSIZE)))\
-               {\
-                       jfs_error((IP)->i_sb, "XT_GETPAGE: xtree page corrupt");\
-                       BT_PUTPAGE(MP);\
-                       MP = NULL;\
-                       RC = -EIO;\
-               }\
-       }\
-}
+#define XT_GETPAGE(IP, BN, MP, SIZE, P, RC)                            \
+do {                                                                   \
+       BT_GETPAGE(IP, BN, MP, xtpage_t, SIZE, P, RC, i_xtroot);        \
+       if (!(RC)) {                                                    \
+               if ((le16_to_cpu((P)->header.nextindex) < XTENTRYSTART) || \
+                   (le16_to_cpu((P)->header.nextindex) >               \
+                    le16_to_cpu((P)->header.maxentry)) ||              \
+                   (le16_to_cpu((P)->header.maxentry) >                \
+                    (((BN) == 0) ? XTROOTMAXSLOT : PSIZE >> L2XTSLOTSIZE))) { \
+                       jfs_error((IP)->i_sb,                           \
+                                 "XT_GETPAGE: xtree page corrupt\n");  \
+                       BT_PUTPAGE(MP);                                 \
+                       MP = NULL;                                      \
+                       RC = -EIO;                                      \
+               }                                                       \
+       }                                                               \
+} while (0)
 
 /* for consistency */
 #define XT_PUTPAGE(MP) BT_PUTPAGE(MP)
@@ -499,7 +500,7 @@ static int xtSearch(struct inode *ip, s64 xoff,     s64 *nextp,
 
                /* push (bn, index) of the parent page/entry */
                if (BT_STACK_FULL(btstack)) {
-                       jfs_error(ip->i_sb, "stack overrun in xtSearch!");
+                       jfs_error(ip->i_sb, "stack overrun!\n");
                        XT_PUTPAGE(mp);
                        return -EIO;
                }
@@ -1385,7 +1386,7 @@ int xtExtend(tid_t tid,           /* transaction id */
 
        if (cmp != 0) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb, "xtExtend: xtSearch did not find extent");
+               jfs_error(ip->i_sb, "xtSearch did not find extent\n");
                return -EIO;
        }
 
@@ -1393,7 +1394,7 @@ int xtExtend(tid_t tid,           /* transaction id */
        xad = &p->xad[index];
        if ((offsetXAD(xad) + lengthXAD(xad)) != xoff) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb, "xtExtend: extension is not contiguous");
+               jfs_error(ip->i_sb, "extension is not contiguous\n");
                return -EIO;
        }
 
@@ -1552,7 +1553,7 @@ printf("xtTailgate: nxoff:0x%lx nxlen:0x%x nxaddr:0x%lx\n",
 
        if (cmp != 0) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb, "xtTailgate: couldn't find extent");
+               jfs_error(ip->i_sb, "couldn't find extent\n");
                return -EIO;
        }
 
@@ -1560,8 +1561,7 @@ printf("xtTailgate: nxoff:0x%lx nxlen:0x%x nxaddr:0x%lx\n",
        nextindex = le16_to_cpu(p->header.nextindex);
        if (index != nextindex - 1) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb,
-                         "xtTailgate: the entry found is not the last entry");
+               jfs_error(ip->i_sb, "the entry found is not the last entry\n");
                return -EIO;
        }
 
@@ -1734,7 +1734,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
 
        if (cmp != 0) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb, "xtUpdate: Could not find extent");
+               jfs_error(ip->i_sb, "Could not find extent\n");
                return -EIO;
        }
 
@@ -1758,7 +1758,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
            (nxoff + nxlen > xoff + xlen)) {
                XT_PUTPAGE(mp);
                jfs_error(ip->i_sb,
-                         "xtUpdate: nXAD in not completely contained within XAD");
+                         "nXAD in not completely contained within XAD\n");
                return -EIO;
        }
 
@@ -1907,7 +1907,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
 
        if (xoff >= nxoff) {
                XT_PUTPAGE(mp);
-               jfs_error(ip->i_sb, "xtUpdate: xoff >= nxoff");
+               jfs_error(ip->i_sb, "xoff >= nxoff\n");
                return -EIO;
        }
 /* #endif _JFS_WIP_COALESCE */
@@ -2048,14 +2048,13 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
 
                if (cmp != 0) {
                        XT_PUTPAGE(mp);
-                       jfs_error(ip->i_sb, "xtUpdate: xtSearch failed");
+                       jfs_error(ip->i_sb, "xtSearch failed\n");
                        return -EIO;
                }
 
                if (index0 != index) {
                        XT_PUTPAGE(mp);
-                       jfs_error(ip->i_sb,
-                                 "xtUpdate: unexpected value of index");
+                       jfs_error(ip->i_sb, "unexpected value of index\n");
                        return -EIO;
                }
        }
@@ -3650,7 +3649,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
       getChild:
        /* save current parent entry for the child page */
        if (BT_STACK_FULL(&btstack)) {
-               jfs_error(ip->i_sb, "stack overrun in xtTruncate!");
+               jfs_error(ip->i_sb, "stack overrun!\n");
                XT_PUTPAGE(mp);
                return -EIO;
        }
@@ -3751,8 +3750,7 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)
 
                if (cmp != 0) {
                        XT_PUTPAGE(mp);
-                       jfs_error(ip->i_sb,
-                                 "xtTruncate_pmap: did not find extent");
+                       jfs_error(ip->i_sb, "did not find extent\n");
                        return -EIO;
                }
        } else {
@@ -3851,7 +3849,7 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)
       getChild:
        /* save current parent entry for the child page */
        if (BT_STACK_FULL(&btstack)) {
-               jfs_error(ip->i_sb, "stack overrun in xtTruncate_pmap!");
+               jfs_error(ip->i_sb, "stack overrun!\n");
                XT_PUTPAGE(mp);
                return -EIO;
        }