Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / staging / lustre / lustre / llite / xattr.c

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 56ab3e6..b439936 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -243,14 +243,11 @@ int ll_setxattr(struct dentry *dentry, const char *name,
                        lump->lmm_stripe_offset = -1;
 
                if (lump != NULL && S_ISREG(inode->i_mode)) {
-                       struct file f;
                        int flags = FMODE_WRITE;
                        int lum_size = (lump->lmm_magic == LOV_USER_MAGIC_V1) ?
                                sizeof(*lump) : sizeof(struct lov_user_md_v3);
 
-                       memset(&f, 0, sizeof(f)); /* f.f_flags is used below */
-                       f.f_dentry = dentry;
-                       rc = ll_lov_setstripe_ea_info(inode, &f, flags, lump,
+                       rc = ll_lov_setstripe_ea_info(inode, dentry, flags, lump,
                                                      lum_size);
                        /* b10667: rc always be 0 here for now */
                        rc = 0;
@@ -521,8 +518,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
                }
 
                if (size < lmmsize) {
-                       CERROR("server bug: replied size %d > %d for %s (%s)\n",
-                              lmmsize, (int)size, dentry->d_name.name, name);
+                       CERROR("server bug: replied size %d > %d for %pd (%s)\n",
+                              lmmsize, (int)size, dentry, name);
                        rc = -ERANGE;
                        goto out;
                }