LU-1434 llog: remove unused llog_create_rec struct

[fs/lustre-release.git] / lustre / llite / xattr.c

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 2e4e530..24a89eb 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -239,10 +239,12 @@ int ll_setxattr(struct dentry *dentry, const char *name,
                 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);
 
-                        f.f_dentry = dentry;
-                        rc = ll_lov_setstripe_ea_info(inode, &f, flags,
-                                                      lump, sizeof(*lump));
+                       f.f_dentry = dentry;
+                       rc = ll_lov_setstripe_ea_info(inode, &f, flags, lump,
+                                                     lum_size);
                         /* b10667: rc always be 0 here for now */
                         rc = 0;
                 } else if (S_ISDIR(inode->i_mode)) {
@@ -489,6 +491,10 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
 
                 lump = (struct lov_user_md *)buffer;
                 memcpy(lump, lmm, lmmsize);
+               /* do not return layout gen for getxattr otherwise it would
+                * confuse tar --xattr by recognizing layout gen as stripe
+                * offset when the file is restored. See LU-2809. */
+               lump->lmm_layout_gen = 0;
 
                 rc = lmmsize;
 out: