1 files changed, 12 insertions, 8 deletions

diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 5f7f1abd5f6d..17c22a8fd40a 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -25,7 +25,9 @@ static struct dentry *hfs_lookup(struct inode *dir, struct dentry *dentry,
         struct inode *inode = NULL;
         int res;
 
-        hfs_find_init(HFS_SB(dir->i_sb)->cat_tree, &fd);
+        res = hfs_find_init(HFS_SB(dir->i_sb)->cat_tree, &fd);
+        if (res)
+                return ERR_PTR(res);
         hfs_cat_build_key(dir->i_sb, fd.search_key, dir->i_ino, &dentry->d_name);
         res = hfs_brec_read(&fd, &rec, sizeof(rec));
         if (res) {
@@ -63,7 +65,9 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         if (filp->f_pos >= inode->i_size)
                 return 0;
 
-        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, inode->i_ino, NULL);
         err = hfs_brec_find(&fd);
         if (err)
@@ -84,12 +88,12 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 
                 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength);
                 if (entry.type != HFS_CDR_THD) {
-                        printk(KERN_ERR "hfs: bad catalog folder thread\n");
+                        pr_err("bad catalog folder thread\n");
                         err = -EIO;
                         goto out;
                 }
                 //if (fd.entrylength < HFS_MIN_THREAD_SZ) {
-                //      printk(KERN_ERR "hfs: truncated catalog thread\n");
+                //      pr_err("truncated catalog thread\n");
                 //      err = -EIO;
                 //      goto out;
                 //}
@@ -108,7 +112,7 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 
         for (;;) {
                 if (be32_to_cpu(fd.key->cat.ParID) != inode->i_ino) {
-                        printk(KERN_ERR "hfs: walked past end of dir\n");
+                        pr_err("walked past end of dir\n");
                         err = -EIO;
                         goto out;
                 }
@@ -123,7 +127,7 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 len = hfs_mac2asc(sb, strbuf, &fd.key->cat.CName);
                 if (type == HFS_CDR_DIR) {
                         if (fd.entrylength < sizeof(struct hfs_cat_dir)) {
-                                printk(KERN_ERR "hfs: small dir entry\n");
+                                pr_err("small dir entry\n");
                                 err = -EIO;
                                 goto out;
                         }
@@ -132,7 +136,7 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                 break;
                 } else if (type == HFS_CDR_FIL) {
                         if (fd.entrylength < sizeof(struct hfs_cat_file)) {
-                                printk(KERN_ERR "hfs: small file entry\n");
+                                pr_err("small file entry\n");
                                 err = -EIO;
                                 goto out;
                         }
@@ -140,7 +144,7 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                     be32_to_cpu(entry.file.FlNum), DT_REG))
                                 break;
                 } else {
-                        printk(KERN_ERR "hfs: bad catalog entry type %d\n", type);
+                        pr_err("bad catalog entry type %d\n", type);
                         err = -EIO;
                         goto out;
                 }