Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

[~andy/linux] / fs / jfs / jfs_dmap.c

diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 9a55f53be5ff6a38678a8d52253b14c7e8004941..370d7b6c5942ccedfa8dcd0c92c353badda41080 100644 (file)
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -346,8 +346,7 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks)
                printk(KERN_ERR "blkno = %Lx, nblocks = %Lx\n",
                       (unsigned long long) blkno,
                       (unsigned long long) nblocks);
-               jfs_error(ip->i_sb,
-                         "dbFree: block to be freed is outside the map");
+               jfs_error(ip->i_sb, "block to be freed is outside the map\n");
                return -EIO;
        }
 
@@ -384,7 +383,7 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks)
 
                /* free the blocks. */
                if ((rc = dbFreeDmap(bmp, dp, blkno, nb))) {
-                       jfs_error(ip->i_sb, "dbFree: error in block map\n");
+                       jfs_error(ip->i_sb, "error in block map\n");
                        release_metapage(mp);
                        IREAD_UNLOCK(ipbmap);
                        return (rc);
@@ -441,8 +440,7 @@ dbUpdatePMap(struct inode *ipbmap,
                printk(KERN_ERR "blkno = %Lx, nblocks = %Lx\n",
                       (unsigned long long) blkno,
                       (unsigned long long) nblocks);
-               jfs_error(ipbmap->i_sb,
-                         "dbUpdatePMap: blocks are outside the map");
+               jfs_error(ipbmap->i_sb, "blocks are outside the map\n");
                return -EIO;
        }
 
@@ -726,7 +724,7 @@ int dbAlloc(struct inode *ip, s64 hint, s64 nblocks, s64 * results)
 
        /* the hint should be within the map */
        if (hint >= mapSize) {
-               jfs_error(ip->i_sb, "dbAlloc: the hint is outside the map");
+               jfs_error(ip->i_sb, "the hint is outside the map\n");
                return -EIO;
        }
 
@@ -1057,8 +1055,7 @@ static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks)
        bmp = sbi->bmap;
        if (lastblkno < 0 || lastblkno >= bmp->db_mapsize) {
                IREAD_UNLOCK(ipbmap);
-               jfs_error(ip->i_sb,
-                         "dbExtend: the block is outside the filesystem");
+               jfs_error(ip->i_sb, "the block is outside the filesystem\n");
                return -EIO;
        }
 
@@ -1134,8 +1131,7 @@ static int dbAllocNext(struct bmap * bmp, struct dmap * dp, s64 blkno,
        u32 mask;
 
        if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAllocNext: Corrupt dmap page");
+               jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmap page\n");
                return -EIO;
        }
 
@@ -1265,8 +1261,7 @@ dbAllocNear(struct bmap * bmp,
        s8 *leaf;
 
        if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAllocNear: Corrupt dmap page");
+               jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmap page\n");
                return -EIO;
        }
 
@@ -1381,8 +1376,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
         */
        if (l2nb > bmp->db_agl2size) {
                jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAllocAG: allocation request is larger than the "
-                         "allocation group size");
+                         "allocation request is larger than the allocation group size\n");
                return -EIO;
        }
 
@@ -1417,7 +1411,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
                               (unsigned long long) blkno,
                               (unsigned long long) nblocks);
                        jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbAllocAG: dbAllocCtl failed in free AG");
+                                 "dbAllocCtl failed in free AG\n");
                }
                return (rc);
        }
@@ -1433,8 +1427,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
        budmin = dcp->budmin;
 
        if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAllocAG: Corrupt dmapctl page");
+               jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n");
                release_metapage(mp);
                return -EIO;
        }
@@ -1475,7 +1468,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
                        }
                        if (n == 4) {
                                jfs_error(bmp->db_ipbmap->i_sb,
-                                         "dbAllocAG: failed descending stree");
+                                         "failed descending stree\n");
                                release_metapage(mp);
                                return -EIO;
                        }
@@ -1515,8 +1508,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
                                       &blkno))) {
                                if (rc == -ENOSPC) {
                                        jfs_error(bmp->db_ipbmap->i_sb,
-                                                 "dbAllocAG: control page "
-                                                 "inconsistent");
+                                                 "control page inconsistent\n");
                                        return -EIO;
                                }
                                return (rc);
@@ -1528,7 +1520,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results)
                rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results);
                if (rc == -ENOSPC) {
                        jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbAllocAG: unable to allocate blocks");
+                                 "unable to allocate blocks\n");
                        rc = -EIO;
                }
                return (rc);
@@ -1587,8 +1579,7 @@ static int dbAllocAny(struct bmap * bmp, s64 nblocks, int l2nb, s64 * results)
         */
        rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results);
        if (rc == -ENOSPC) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAllocAny: unable to allocate blocks");
+               jfs_error(bmp->db_ipbmap->i_sb, "unable to allocate blocks\n");
                return -EIO;
        }
        return (rc);
@@ -1652,8 +1643,7 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)
        range_cnt = min_t(u64, max_ranges + 1, 32 * 1024);
        totrim = kmalloc(sizeof(struct range2trim) * range_cnt, GFP_NOFS);
        if (totrim == NULL) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbDiscardAG: no memory for trim array");
+               jfs_error(bmp->db_ipbmap->i_sb, "no memory for trim array\n");
                IWRITE_UNLOCK(ipbmap);
                return 0;
        }
@@ -1682,8 +1672,7 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)
                        nblocks = 1 << l2nb;
                } else {
                        /* Trim any already allocated blocks */
-                       jfs_error(bmp->db_ipbmap->i_sb,
-                               "dbDiscardAG: -EIO");
+                       jfs_error(bmp->db_ipbmap->i_sb, "-EIO\n");
                        break;
                }
 
@@ -1761,7 +1750,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno)
 
                if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
                        jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbFindCtl: Corrupt dmapctl page");
+                                 "Corrupt dmapctl page\n");
                        release_metapage(mp);
                        return -EIO;
                }
@@ -1782,7 +1771,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno)
                if (rc) {
                        if (lev != level) {
                                jfs_error(bmp->db_ipbmap->i_sb,
-                                         "dbFindCtl: dmap inconsistent");
+                                         "dmap inconsistent\n");
                                return -EIO;
                        }
                        return -ENOSPC;
@@ -1906,7 +1895,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
                if (dp->tree.stree[ROOT] != L2BPERDMAP) {
                        release_metapage(mp);
                        jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbAllocCtl: the dmap is not all free");
+                                 "the dmap is not all free\n");
                        rc = -EIO;
                        goto backout;
                }
@@ -1953,7 +1942,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
                         * to indicate that we have leaked blocks.
                         */
                        jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbAllocCtl: I/O Error: Block Leakage.");
+                                 "I/O Error: Block Leakage\n");
                        continue;
                }
                dp = (struct dmap *) mp->data;
@@ -1965,8 +1954,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
                         * to indicate that we have leaked blocks.
                         */
                        release_metapage(mp);
-                       jfs_error(bmp->db_ipbmap->i_sb,
-                                 "dbAllocCtl: Block Leakage.");
+                       jfs_error(bmp->db_ipbmap->i_sb, "Block Leakage\n");
                        continue;
                }
 
@@ -2263,8 +2251,7 @@ static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno,
                        for (; nwords > 0; nwords -= nw) {
                                if (leaf[word] < BUDMIN) {
                                        jfs_error(bmp->db_ipbmap->i_sb,
-                                                 "dbAllocBits: leaf page "
-                                                 "corrupt");
+                                                 "leaf page corrupt\n");
                                        break;
                                }
 
@@ -2536,8 +2523,7 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level)
        dcp = (struct dmapctl *) mp->data;
 
        if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {
-               jfs_error(bmp->db_ipbmap->i_sb,
-                         "dbAdjCtl: Corrupt dmapctl page");
+               jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n");
                release_metapage(mp);
                return -EIO;
        }
@@ -2638,8 +2624,7 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level)
                        assert(level == bmp->db_maxlevel);
                        if (bmp->db_maxfreebud != oldroot) {
                                jfs_error(bmp->db_ipbmap->i_sb,
-                                         "dbAdjCtl: the maximum free buddy is "
-                                         "not the old root");
+                                         "the maximum free buddy is not the old root\n");
                        }
                        bmp->db_maxfreebud = dcp->stree[ROOT];
                }
@@ -3481,7 +3466,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno,   s64 nblocks)
        p = BMAPBLKNO + nbperpage;      /* L2 page */
        l2mp = read_metapage(ipbmap, p, PSIZE, 0);
        if (!l2mp) {
-               jfs_error(ipbmap->i_sb, "dbExtendFS: L2 page could not be read");
+               jfs_error(ipbmap->i_sb, "L2 page could not be read\n");
                return -EIO;
        }
        l2dcp = (struct dmapctl *) l2mp->data;
@@ -3646,8 +3631,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno,   s64 nblocks)
                }
        }                       /* for each L1 in a L2 */
 
-       jfs_error(ipbmap->i_sb,
-                 "dbExtendFS: function has not returned as expected");
+       jfs_error(ipbmap->i_sb, "function has not returned as expected\n");
 errout:
        if (l0mp)
                release_metapage(l0mp);
@@ -3717,7 +3701,7 @@ void dbFinalizeBmap(struct inode *ipbmap)
                }
                if (bmp->db_agpref >= bmp->db_numag) {
                        jfs_error(ipbmap->i_sb,
-                                 "cannot find ag with average freespace");
+                                 "cannot find ag with average freespace\n");
                }
        }