X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fxattr.c;h=013a1b3aede62867c37183e78930530cb4f9a88d;hb=c4118a072e98909fb95199158ed1b1d66cf421ee;hp=a525a648b6a4b4558bf73b3e203c46625f64adc2;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c index a525a64..013a1b3 100644 --- a/lustre/llite/xattr.c +++ b/lustre/llite/xattr.c @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -45,16 +45,10 @@ #include #include #include -//#include -#include +#include #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) @@ -101,7 +95,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_TRUSTED_T && !capable(CAP_SYS_ADMIN)) + if (xattr_type == XATTR_TRUSTED_T && !cfs_capable(CFS_CAP_SYS_ADMIN)) return -EPERM; if (xattr_type == XATTR_OTHER_T) return -EOPNOTSUPP; @@ -134,6 +128,11 @@ int ll_setxattr_common(struct inode *inode, const char *name, (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0)) RETURN(0); + /* b15587: ignore security.capability xattr for now */ + if ((xattr_type == XATTR_SECURITY_T && + strcmp(name, "security.capability") == 0)) + RETURN(0); + #ifdef CONFIG_FS_POSIX_ACL if (sbi->ll_flags & LL_SBI_RMT_CLIENT && (xattr_type == XATTR_ACL_ACCESS_T || @@ -192,7 +191,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 " - "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); @@ -215,30 +214,39 @@ int ll_setxattr(struct dentry *dentry, const char *name, 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) || - (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; - if (S_ISREG(inode->i_mode)) { + /* 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 != NULL && lump->lmm_stripe_offset == 0) + lump->lmm_stripe_offset = -1; + + if (lump != NULL && S_ISREG(inode->i_mode)) { struct file f; int flags = FMODE_WRITE; - + 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); } - + 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); @@ -289,6 +297,11 @@ int ll_getxattr_common(struct inode *inode, const char *name, if (rc) RETURN(rc); + /* b15587: ignore security.capability xattr for now */ + if ((xattr_type == XATTR_SECURITY_T && + strcmp(name, "security.capability") == 0)) + RETURN(-ENODATA); + #ifdef CONFIG_FS_POSIX_ACL if (sbi->ll_flags & LL_SBI_RMT_CLIENT && (xattr_type == XATTR_ACL_ACCESS_T || @@ -301,21 +314,19 @@ int ll_getxattr_common(struct inode *inode, const char *name, rce->rce_ops != RMT_RGETFACL)) RETURN(-EOPNOTSUPP); } -#endif /* posix acl is under protection of LOOKUP lock. when calling to this, * we just have path resolution to the target inode, so we have great * chance that cached ACL is uptodate. */ -#ifdef CONFIG_FS_POSIX_ACL if (xattr_type == XATTR_ACL_ACCESS_T && !(sbi->ll_flags & LL_SBI_RMT_CLIENT)) { struct ll_inode_info *lli = ll_i2info(inode); struct posix_acl *acl; - spin_lock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_lock); acl = posix_acl_dup(lli->lli_posix_acl); - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_lock); if (!acl) RETURN(-ENODATA); @@ -337,7 +348,7 @@ do_getxattr: 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); @@ -356,6 +367,9 @@ do_getxattr: GOTO(out, rc = -ERANGE); } + if (body->eadatasize == 0) + GOTO(out, rc = -ENODATA); + /* do not need swab xattr data */ xdata = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, body->eadatasize); @@ -378,13 +392,15 @@ do_getxattr: GOTO(out, rc); } } - - if (xattr_type == XATTR_ACL_ACCESS_T && !body->eadatasize) - GOTO(out, rc = -ENODATA); #endif - LASSERT(buffer); - memcpy(buffer, xdata, body->eadatasize); - rc = body->eadatasize; + + if (body->eadatasize == 0) { + rc = -ENODATA; + } else { + LASSERT(buffer); + memcpy(buffer, xdata, body->eadatasize); + rc = body->eadatasize; + } EXIT; out: ptlrpc_req_finished(req); @@ -404,33 +420,56 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name, 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) || - (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; - int rc = 0, lmmsize; + int rc = 0, lmmsize = 0; - if (S_ISREG(inode->i_mode)) { - rc = ll_lov_getstripe_ea_info(dentry->d_parent->d_inode, - dentry->d_name.name, &lmm, + if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode)) + return -ENODATA; + + if (size == 0 && S_ISDIR(inode->i_mode)) { + /* XXX directory EA is fix for now, optimize to save + * RPC transfer */ + GOTO(out, rc = sizeof(struct lov_user_md)); + } + + if (!ll_i2info(inode)->lli_smd) { + if (S_ISDIR(inode->i_mode)) { + rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request); - } else if (S_ISDIR(inode->i_mode)) { - rc = ll_dir_getstripe(inode, &lmm, &lmmsize, &request); + } else { + rc = -ENODATA; + } + } else { + /* LSM is present already after lookup/getattr call. + * we need to grab layout lock once it is implemented */ + rc = obd_packmd(ll_i2dtexp(inode), &lmm, + ll_i2info(inode)->lli_smd); + lmmsize = rc; } if (rc < 0) GOTO(out, rc); - if (size == 0) - GOTO(out, rc = lmmsize); + + if (size == 0) { + /* used to call ll_get_max_mdsize() forward to get + * the maximum buffer size, while some apps (such as + * rsync 3.0.x) care much about the exact xattr value + * size */ + rc = lmmsize; + GOTO(out, rc); + } 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); } @@ -439,7 +478,10 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name, rc = lmmsize; out: - ptlrpc_req_finished(request); + if (request) + ptlrpc_req_finished(request); + else if (lmm) + obd_free_diskmd(ll_i2dtexp(inode), &lmm); return(rc); } @@ -462,20 +504,22 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size) ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_LISTXATTR, 1); rc = ll_getxattr_common(inode, NULL, buffer, size, OBD_MD_FLXATTRLS); + if (rc < 0) + GOTO(out, rc); if (S_ISREG(inode->i_mode)) { struct ll_inode_info *lli = ll_i2info(inode); 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); } if (rc2 < 0) { GOTO(out, rc2 = 0); - } else { + } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) { const int prefix_len = sizeof(XATTR_LUSTRE_PREFIX) - 1; const size_t name_len = sizeof("lov") - 1; const size_t total_len = prefix_len + name_len + 1; @@ -491,7 +535,6 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size) out: ptlrpc_req_finished(request); rc = rc + rc2; - + return rc; } -