Merge tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm

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

diff --git a/fs/hfsplus/attributes.c b/fs/hfsplus/attributes.c
index 8d691f124714bd491593932ad347bee6041bdf65..0f47890299c4565aef08c06c335040400e729dd6 100644 (file)
--- a/fs/hfsplus/attributes.c
+++ b/fs/hfsplus/attributes.c
@@ -56,7 +56,7 @@ int hfsplus_attr_build_key(struct super_block *sb, hfsplus_btree_key *key,
        if (name) {
                len = strlen(name);
                if (len > HFSPLUS_ATTR_MAX_STRLEN) {
-                       printk(KERN_ERR "hfs: invalid xattr name's length\n");
+                       pr_err("invalid xattr name's length\n");
                        return -EINVAL;
                }
                hfsplus_asc2uni(sb,
@@ -166,10 +166,10 @@ int hfsplus_find_attr(struct super_block *sb, u32 cnid,
 {
        int err = 0;
 
-       dprint(DBG_ATTR_MOD, "find_attr: %s,%d\n", name ? name : NULL, cnid);
+       hfs_dbg(ATTR_MOD, "find_attr: %s,%d\n", name ? name : NULL, cnid);
 
        if (!HFSPLUS_SB(sb)->attr_tree) {
-               printk(KERN_ERR "hfs: attributes file doesn't exist\n");
+               pr_err("attributes file doesn't exist\n");
                return -EINVAL;
        }
 
@@ -228,11 +228,11 @@ int hfsplus_create_attr(struct inode *inode,
        int entry_size;
        int err;
 
-       dprint(DBG_ATTR_MOD, "create_attr: %s,%ld\n",
+       hfs_dbg(ATTR_MOD, "create_attr: %s,%ld\n",
                name ? name : NULL, inode->i_ino);
 
        if (!HFSPLUS_SB(sb)->attr_tree) {
-               printk(KERN_ERR "hfs: attributes file doesn't exist\n");
+               pr_err("attributes file doesn't exist\n");
                return -EINVAL;
        }
 
@@ -307,10 +307,10 @@ static int __hfsplus_delete_attr(struct inode *inode, u32 cnid,
                break;
        case HFSPLUS_ATTR_FORK_DATA:
        case HFSPLUS_ATTR_EXTENTS:
-               printk(KERN_ERR "hfs: only inline data xattr are supported\n");
+               pr_err("only inline data xattr are supported\n");
                return -EOPNOTSUPP;
        default:
-               printk(KERN_ERR "hfs: invalid extended attribute record\n");
+               pr_err("invalid extended attribute record\n");
                return -ENOENT;
        }
 
@@ -328,11 +328,11 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)
        struct super_block *sb = inode->i_sb;
        struct hfs_find_data fd;
 
-       dprint(DBG_ATTR_MOD, "delete_attr: %s,%ld\n",
+       hfs_dbg(ATTR_MOD, "delete_attr: %s,%ld\n",
                name ? name : NULL, inode->i_ino);
 
        if (!HFSPLUS_SB(sb)->attr_tree) {
-               printk(KERN_ERR "hfs: attributes file doesn't exist\n");
+               pr_err("attributes file doesn't exist\n");
                return -EINVAL;
        }
 
@@ -346,7 +346,7 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)
                if (err)
                        goto out;
        } else {
-               printk(KERN_ERR "hfs: invalid extended attribute name\n");
+               pr_err("invalid extended attribute name\n");
                err = -EINVAL;
                goto out;
        }
@@ -369,10 +369,10 @@ int hfsplus_delete_all_attrs(struct inode *dir, u32 cnid)
        int err = 0;
        struct hfs_find_data fd;
 
-       dprint(DBG_ATTR_MOD, "delete_all_attrs: %d\n", cnid);
+       hfs_dbg(ATTR_MOD, "delete_all_attrs: %d\n", cnid);
 
        if (!HFSPLUS_SB(dir->i_sb)->attr_tree) {
-               printk(KERN_ERR "hfs: attributes file doesn't exist\n");
+               pr_err("attributes file doesn't exist\n");
                return -EINVAL;
        }
 
@@ -384,7 +384,7 @@ int hfsplus_delete_all_attrs(struct inode *dir, u32 cnid)
                err = hfsplus_find_attr(dir->i_sb, cnid, NULL, &fd);
                if (err) {
                        if (err != -ENOENT)
-                               printk(KERN_ERR "hfs: xattr search failed.\n");
+                               pr_err("xattr search failed\n");
                        goto end_delete_all;
                }