Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3304 tests: sanity-quota test_18 watchdog triggered
[fs/lustre-release.git]
/
lustre
/
llite
/
xattr.c
diff --git
a/lustre/llite/xattr.c
b/lustre/llite/xattr.c
index
48b3fcb
..
a08c58a
100644
(file)
--- a/
lustre/llite/xattr.c
+++ b/
lustre/llite/xattr.c
@@
-27,7
+27,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
2, Whamcloud, Inc
.
+ * Copyright (c) 2011, 201
3, Intel Corporation
.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-47,7
+47,7
@@
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
-#include <lustre_acl.h>
+#include <lustre_
e
acl.h>
#include "llite_internal.h"
#include "llite_internal.h"
@@
-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;
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)) {
/* b10667: rc always be 0 here for now */
rc = 0;
} else if (S_ISDIR(inode->i_mode)) {
@@
-336,14
+338,14
@@
int ll_getxattr_common(struct inode *inode, const char *name,
struct ll_inode_info *lli = ll_i2info(inode);
struct posix_acl *acl;
struct ll_inode_info *lli = ll_i2info(inode);
struct posix_acl *acl;
-
cfs_
spin_lock(&lli->lli_lock);
-
acl = posix_acl_dup(lli->lli_posix_acl);
-
cfs_
spin_unlock(&lli->lli_lock);
+ spin_lock(&lli->lli_lock);
+ acl = posix_acl_dup(lli->lli_posix_acl);
+ spin_unlock(&lli->lli_lock);
if (!acl)
RETURN(-ENODATA);
if (!acl)
RETURN(-ENODATA);
- rc = posix_acl_to_xattr(acl, buffer, size);
+ rc = posix_acl_to_xattr(
&init_user_ns,
acl, buffer, size);
posix_acl_release(acl);
RETURN(rc);
}
posix_acl_release(acl);
RETURN(rc);
}
@@
-489,6
+491,10
@@
ssize_t ll_getxattr(struct dentry *dentry, const char *name,
lump = (struct lov_user_md *)buffer;
memcpy(lump, lmm, lmmsize);
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:
rc = lmmsize;
out: