Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / fs / hfsplus / bitmap.c

diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c
index 6feefc0cb48a0cf2fe9a646e9de4d0434ac7cdce..d2954451519ed64bc93028d33341f4ad85a8f990 100644 (file)
--- a/fs/hfsplus/bitmap.c
+++ b/fs/hfsplus/bitmap.c
@@ -30,7 +30,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
        if (!len)
                return size;
 
-       dprint(DBG_BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);
+       hfs_dbg(BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);
        mutex_lock(&sbi->alloc_mutex);
        mapping = sbi->alloc_file->i_mapping;
        page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS, NULL);
@@ -89,14 +89,14 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
                else
                        end = pptr + ((size + 31) & (PAGE_CACHE_BITS - 1)) / 32;
        }
-       dprint(DBG_BITMAP, "bitmap full\n");
+       hfs_dbg(BITMAP, "bitmap full\n");
        start = size;
        goto out;
 
 found:
        start = offset + (curr - pptr) * 32 + i;
        if (start >= size) {
-               dprint(DBG_BITMAP, "bitmap full\n");
+               hfs_dbg(BITMAP, "bitmap full\n");
                goto out;
        }
        /* do any partial u32 at the start */
@@ -154,7 +154,7 @@ done:
        *max = offset + (curr - pptr) * 32 + i - start;
        sbi->free_blocks -= *max;
        hfsplus_mark_mdb_dirty(sb);
-       dprint(DBG_BITMAP, "-> %u,%u\n", start, *max);
+       hfs_dbg(BITMAP, "-> %u,%u\n", start, *max);
 out:
        mutex_unlock(&sbi->alloc_mutex);
        return start;
@@ -173,7 +173,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
        if (!count)
                return 0;
 
-       dprint(DBG_BITMAP, "block_free: %u,%u\n", offset, count);
+       hfs_dbg(BITMAP, "block_free: %u,%u\n", offset, count);
        /* are all of the bits in range? */
        if ((offset + count) > sbi->total_blocks)
                return -ENOENT;
@@ -238,8 +238,7 @@ out:
        return 0;
 
 kaboom:
-       printk(KERN_CRIT "hfsplus: unable to mark blocks free: error %ld\n",
-                       PTR_ERR(page));
+       pr_crit("unable to mark blocks free: error %ld\n", PTR_ERR(page));
        mutex_unlock(&sbi->alloc_mutex);
 
        return -EIO;