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

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

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index dd2d872..96f3448 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -108,7 +108,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
                                .dirtied_ino_d = ALIGN(host_ui->data_len, 8) };
 
        if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE) {
-               ubifs_err("inode %lu already has too many xattrs (%d), cannot create more",
+               ubifs_err(c, "inode %lu already has too many xattrs (%d), cannot create more",
                          host->i_ino, host_ui->xattr_cnt);
                return -ENOSPC;
        }
@@ -120,7 +120,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
         */
        names_len = host_ui->xattr_names + host_ui->xattr_cnt + nm->len + 1;
        if (names_len > XATTR_LIST_MAX) {
-               ubifs_err("cannot add one more xattr name to inode %lu, total names length would become %d, max. is %d",
+               ubifs_err(c, "cannot add one more xattr name to inode %lu, total names length would become %d, max. is %d",
                          host->i_ino, names_len, XATTR_LIST_MAX);
                return -ENOSPC;
        }
@@ -288,13 +288,13 @@ static struct inode *iget_xattr(struct ubifs_info *c, ino_t inum)
 
        inode = ubifs_iget(c->vfs_sb, inum);
        if (IS_ERR(inode)) {
-               ubifs_err("dead extended attribute entry, error %d",
+               ubifs_err(c, "dead extended attribute entry, error %d",
                          (int)PTR_ERR(inode));
                return inode;
        }
        if (ubifs_inode(inode)->xattr)
                return inode;
-       ubifs_err("corrupt extended attribute entry");
+       ubifs_err(c, "corrupt extended attribute entry");
        iput(inode);
        return ERR_PTR(-EINVAL);
 }
@@ -412,7 +412,7 @@ 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) {
-                       ubifs_err("buffer size %zd, xattr len %d",
+                       ubifs_err(c, "buffer size %zd, xattr len %d",
                                  size, ui->data_len);
                        err = -ERANGE;
                        goto out_iput;
@@ -485,7 +485,7 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 
        kfree(pxent);
        if (err != -ENOENT) {
-               ubifs_err("cannot find next direntry, error %d", err);
+               ubifs_err(c, "cannot find next direntry, error %d", err);
                return err;
        }
 
@@ -657,8 +657,10 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
                                           &init_xattrs, 0);
        mutex_unlock(&inode->i_mutex);
 
-       if (err)
-               ubifs_err("cannot initialize security for inode %lu, error %d",
+       if (err) {
+               struct ubifs_info *c = dentry->i_sb->s_fs_info;
+               ubifs_err(c, "cannot initialize security for inode %lu, error %d",
                          inode->i_ino, err);
+       }
        return err;
 }