hfs/hfsplus: convert printks to pr_<level>

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

diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 424b033..ff0316b 100644 (file)
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -87,12 +87,15 @@ int hfs_cat_create(u32 cnid, struct inode *dir, struct qstr *str, struct inode *
        int entry_size;
        int err;
 
-       dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n", str->name, cnid, inode->i_nlink);
+       hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
+               str->name, cnid, inode->i_nlink);
        if (dir->i_size >= HFS_MAX_VALENCE)
                return -ENOSPC;
 
        sb = dir->i_sb;
-       hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
+       err = hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
+       if (err)
+               return err;
 
        hfs_cat_build_key(sb, fd.search_key, cnid, NULL);
        entry_size = hfs_cat_build_thread(sb, &entry, S_ISDIR(inode->i_mode) ?
@@ -184,14 +187,14 @@ int hfs_cat_find_brec(struct super_block *sb, u32 cnid,
 
        type = rec.type;
        if (type != HFS_CDR_THD && type != HFS_CDR_FTH) {
-               printk(KERN_ERR "hfs: found bad thread record in catalog\n");
+               pr_err("found bad thread record in catalog\n");
                return -EIO;
        }
 
        fd->search_key->cat.ParID = rec.thread.ParID;
        len = fd->search_key->cat.CName.len = rec.thread.CName.len;
        if (len > HFS_NAMELEN) {
-               printk(KERN_ERR "hfs: bad catalog namelength\n");
+               pr_err("bad catalog namelength\n");
                return -EIO;
        }
        memcpy(fd->search_key->cat.CName.name, rec.thread.CName.name, len);
@@ -212,9 +215,11 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str)
        struct list_head *pos;
        int res, 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);
        sb = dir->i_sb;
-       hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
+       res = hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
+       if (res)
+               return res;
 
        hfs_cat_build_key(sb, fd.search_key, dir->i_ino, str);
        res = hfs_brec_find(&fd);
@@ -278,10 +283,13 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, struct qstr *src_name,
        int entry_size, type;
        int err;
 
-       dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
+       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);
        sb = src_dir->i_sb;
-       hfs_find_init(HFS_SB(sb)->cat_tree, &src_fd);
+       err = hfs_find_init(HFS_SB(sb)->cat_tree, &src_fd);
+       if (err)
+               return err;
        dst_fd = src_fd;
 
        /* find the old dir entry and read the data */