hfs/hfsplus: convert dprint to hfs_dbg
Use a more current logging style. Rename macro and uses. Add do {} while (0) to macro. Add DBG_ to macro. Add and use hfs_dbg_cont variant where appropriate. Signed-off-by: Joe Perches <joe@perches.com> Cc: Vyacheslav Dubeyko <slava@dubeyko.com> Cc: Hin-Tak Leung <htl10@users.sourceforge.net> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
5f3726f945
commit
c2b3e1f76e
@@ -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;
|
||||
|
Reference in New Issue
Block a user