Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[cascardo/linux.git] / fs / hfsplus / catalog.c

diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index 840d71e..968ce41 100644 (file)
--- a/fs/hfsplus/catalog.c
+++ b/fs/hfsplus/catalog.c
@@ -188,12 +188,12 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
 
        type = be16_to_cpu(tmp.type);
        if (type != HFSPLUS_FOLDER_THREAD && type != HFSPLUS_FILE_THREAD) {
-               printk(KERN_ERR "hfs: found bad thread record in catalog\n");
+               pr_err("found bad thread record in catalog\n");
                return -EIO;
        }
 
        if (be16_to_cpu(tmp.thread.nodeName.length) > 255) {
-               printk(KERN_ERR "hfs: catalog name length corrupted\n");
+               pr_err("catalog name length corrupted\n");
                return -EIO;
        }
 
@@ -212,7 +212,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,
        int entry_size;
        int err;
 
-       dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n",
+       hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
                str->name, cnid, inode->i_nlink);
        err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
        if (err)
@@ -271,8 +271,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
        int err, off;
        u16 type;
 
-       dprint(DBG_CAT_MOD, "delete_cat: %s,%u\n",
-               str ? str->name : NULL, cnid);
+       hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
        err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
        if (err)
                return err;
@@ -361,7 +360,7 @@ int hfsplus_rename_cat(u32 cnid,
        int entry_size, type;
        int err;
 
-       dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
+       hfs_dbg(CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
                cnid, src_dir->i_ino, src_name->name,
                dst_dir->i_ino, dst_name->name);
        err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &src_fd);