Merge branch 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / ubifs / xattr.c

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 85b2722687545b0e3299d7bdc0275ebe9fb2d2e2..0f7139bdb2c20370f7f81489b14db155128c2f62 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -298,7 +298,7 @@ int ubifs_setxattr(struct dentry *dentry, const char *name,
 {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
-       struct qstr nm = { .name = name, .len = strlen(name) };
+       struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_dent_node *xent;
        union ubifs_key key;
        int err, type;
@@ -361,7 +361,7 @@ ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
 {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
-       struct qstr nm = { .name = name, .len = strlen(name) };
+       struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_inode *ui;
        struct ubifs_dent_node *xent;
        union ubifs_key key;
@@ -399,8 +399,8 @@ ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
        if (buf) {
                /* If @buf is %NULL we are supposed to return the length */
                if (ui->data_len > size) {
-                       dbg_err("buffer size %zd, xattr len %d",
-                               size, ui->data_len);
+                       ubifs_err("buffer size %zd, xattr len %d",
+                                 size, ui->data_len);
                        err = -ERANGE;
                        goto out_iput;
                }
@@ -524,7 +524,7 @@ int ubifs_removexattr(struct dentry *dentry, const char *name)
 {
        struct inode *inode, *host = dentry->d_inode;
        struct ubifs_info *c = host->i_sb->s_fs_info;
-       struct qstr nm = { .name = name, .len = strlen(name) };
+       struct qstr nm = QSTR_INIT(name, strlen(name));
        struct ubifs_dent_node *xent;
        union ubifs_key key;
        int err;