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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
llite
/
xattr.c
diff --git
a/lustre/llite/xattr.c
b/lustre/llite/xattr.c
index
28075a9
..
b8bb7f1
100644
(file)
--- a/
lustre/llite/xattr.c
+++ b/
lustre/llite/xattr.c
@@
-50,11
+50,6
@@
#include "llite_internal.h"
#include "llite_internal.h"
-#define XATTR_USER_PREFIX "user."
-#define XATTR_TRUSTED_PREFIX "trusted."
-#define XATTR_SECURITY_PREFIX "security."
-#define XATTR_LUSTRE_PREFIX "lustre."
-
#define XATTR_USER_T (1)
#define XATTR_TRUSTED_T (2)
#define XATTR_SECURITY_T (3)
#define XATTR_USER_T (1)
#define XATTR_TRUSTED_T (2)
#define XATTR_SECURITY_T (3)
@@
-101,7
+96,7
@@
int xattr_type_filter(struct ll_sb_info *sbi, int xattr_type)
if (xattr_type == XATTR_USER_T && !(sbi->ll_flags & LL_SBI_USER_XATTR))
return -EOPNOTSUPP;
if (xattr_type == XATTR_USER_T && !(sbi->ll_flags & LL_SBI_USER_XATTR))
return -EOPNOTSUPP;
- if (xattr_type == XATTR_TRUSTED_T && !c
apable(
CAP_SYS_ADMIN))
+ if (xattr_type == XATTR_TRUSTED_T && !c
fs_capable(CFS_
CAP_SYS_ADMIN))
return -EPERM;
if (xattr_type == XATTR_OTHER_T)
return -EOPNOTSUPP;
return -EPERM;
if (xattr_type == XATTR_OTHER_T)
return -EOPNOTSUPP;
@@
-192,7
+187,7
@@
int ll_setxattr_common(struct inode *inode, const char *name,
if (rc) {
if (rc == -EOPNOTSUPP && xattr_type == XATTR_USER_T) {
LCONSOLE_INFO("Disabling user_xattr feature because "
if (rc) {
if (rc == -EOPNOTSUPP && xattr_type == XATTR_USER_T) {
LCONSOLE_INFO("Disabling user_xattr feature because "
- "it is not supported on the server\n");
+ "it is not supported on the server\n");
sbi->ll_flags &= ~LL_SBI_USER_XATTR;
}
RETURN(rc);
sbi->ll_flags &= ~LL_SBI_USER_XATTR;
}
RETURN(rc);
@@
-215,30
+210,39
@@
int ll_setxattr(struct dentry *dentry, const char *name,
ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_SETXATTR, 1);
ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_SETXATTR, 1);
- if ((strncmp(name, XATTR_TRUSTED_PREFIX,
+ if ((strncmp(name, XATTR_TRUSTED_PREFIX,
sizeof(XATTR_TRUSTED_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_TRUSTED_PREFIX) - 1, "lov") == 0) ||
sizeof(XATTR_TRUSTED_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_TRUSTED_PREFIX) - 1, "lov") == 0) ||
- (strncmp(name, XATTR_LUSTRE_PREFIX,
+ (strncmp(name, XATTR_LUSTRE_PREFIX,
sizeof(XATTR_LUSTRE_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_LUSTRE_PREFIX) - 1, "lov") == 0)) {
struct lov_user_md *lump = (struct lov_user_md *)value;
int rc = 0;
sizeof(XATTR_LUSTRE_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_LUSTRE_PREFIX) - 1, "lov") == 0)) {
struct lov_user_md *lump = (struct lov_user_md *)value;
int rc = 0;
+ /* Attributes that are saved via getxattr will always have
+ * the stripe_offset as 0. Instead, the MDS should be
+ * allowed to pick the starting OST index. b=17846 */
+ if (lump->lmm_stripe_offset == 0)
+ lump->lmm_stripe_offset = -1;
+
if (S_ISREG(inode->i_mode)) {
struct file f;
int flags = FMODE_WRITE;
if (S_ISREG(inode->i_mode)) {
struct file f;
int flags = FMODE_WRITE;
-
+
f.f_dentry = dentry;
f.f_dentry = dentry;
- rc = ll_lov_setstripe_ea_info(inode, &f, flags,
+ rc = ll_lov_setstripe_ea_info(inode, &f, flags,
lump, sizeof(*lump));
/* b10667: rc always be 0 here for now */
rc = 0;
} else if (S_ISDIR(inode->i_mode)) {
rc = ll_dir_setstripe(inode, lump, 0);
}
lump, sizeof(*lump));
/* b10667: rc always be 0 here for now */
rc = 0;
} else if (S_ISDIR(inode->i_mode)) {
rc = ll_dir_setstripe(inode, lump, 0);
}
-
+
return rc;
return rc;
- }
+
+ } else if (strcmp(name, XATTR_NAME_LMA) == 0 ||
+ strcmp(name, XATTR_NAME_LINK) == 0)
+ return 0;
return ll_setxattr_common(inode, name, value, size, flags,
OBD_MD_FLXATTR);
return ll_setxattr_common(inode, name, value, size, flags,
OBD_MD_FLXATTR);
@@
-337,7
+341,7
@@
do_getxattr:
if (rc) {
if (rc == -EOPNOTSUPP && xattr_type == XATTR_USER_T) {
LCONSOLE_INFO("Disabling user_xattr feature because "
if (rc) {
if (rc == -EOPNOTSUPP && xattr_type == XATTR_USER_T) {
LCONSOLE_INFO("Disabling user_xattr feature because "
- "it is not supported on the server\n");
+ "it is not supported on the server\n");
sbi->ll_flags &= ~LL_SBI_USER_XATTR;
}
RETURN(rc);
sbi->ll_flags &= ~LL_SBI_USER_XATTR;
}
RETURN(rc);
@@
-404,23
+408,25
@@
ssize_t ll_getxattr(struct dentry *dentry, const char *name,
ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_GETXATTR, 1);
ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_GETXATTR, 1);
- if ((strncmp(name, XATTR_TRUSTED_PREFIX,
+ if ((strncmp(name, XATTR_TRUSTED_PREFIX,
sizeof(XATTR_TRUSTED_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_TRUSTED_PREFIX) - 1, "lov") == 0) ||
sizeof(XATTR_TRUSTED_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_TRUSTED_PREFIX) - 1, "lov") == 0) ||
- (strncmp(name, XATTR_LUSTRE_PREFIX,
+ (strncmp(name, XATTR_LUSTRE_PREFIX,
sizeof(XATTR_LUSTRE_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_LUSTRE_PREFIX) - 1, "lov") == 0)) {
struct lov_user_md *lump;
struct lov_mds_md *lmm = NULL;
struct ptlrpc_request *request = NULL;
sizeof(XATTR_LUSTRE_PREFIX) - 1) == 0 &&
strcmp(name + sizeof(XATTR_LUSTRE_PREFIX) - 1, "lov") == 0)) {
struct lov_user_md *lump;
struct lov_mds_md *lmm = NULL;
struct ptlrpc_request *request = NULL;
- int rc = 0, lmmsize;
+ int rc = 0, lmmsize
= 0
;
if (S_ISREG(inode->i_mode)) {
if (S_ISREG(inode->i_mode)) {
- rc = ll_lov_getstripe_ea_info(dentry->d_parent->d_inode,
- dentry->d_name.name, &lmm,
+ rc = ll_lov_getstripe_ea_info(dentry->d_parent->d_inode,
+ dentry->d_name.name, &lmm,
&lmmsize, &request);
} else if (S_ISDIR(inode->i_mode)) {
rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
&lmmsize, &request);
} else if (S_ISDIR(inode->i_mode)) {
rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
+ } else {
+ rc = -ENODATA;
}
if (rc < 0)
}
if (rc < 0)
@@
-429,8
+435,8
@@
ssize_t ll_getxattr(struct dentry *dentry, const char *name,
GOTO(out, rc = lmmsize);
if (size < lmmsize) {
GOTO(out, rc = lmmsize);
if (size < lmmsize) {
- CERROR("server bug: replied size %
u > %u
\n",
- lmmsize, (int)size);
+ CERROR("server bug: replied size %
d > %d for %s (%s)
\n",
+ lmmsize, (int)size
, dentry->d_name.name, name
);
GOTO(out, rc = -ERANGE);
}
GOTO(out, rc = -ERANGE);
}
@@
-468,7
+474,7
@@
ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
struct lov_stripe_md *lsm = NULL;
lsm = lli->lli_smd;
if (lsm == NULL)
struct lov_stripe_md *lsm = NULL;
lsm = lli->lli_smd;
if (lsm == NULL)
- rc2 = -1;
+ rc2 = -1;
} else if (S_ISDIR(inode->i_mode)) {
rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
}
} else if (S_ISDIR(inode->i_mode)) {
rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
}
@@
-491,6
+497,6
@@
ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
out:
ptlrpc_req_finished(request);
rc = rc + rc2;
out:
ptlrpc_req_finished(request);
rc = rc + rc2;
-
+
return rc;
}
return rc;
}