X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fxattr.c;h=863f98bd74ddcfd389b31b249a11249361d47239;hb=51206e8cd42134400fa0b6259a92d7138f3dc984;hp=f00f4f0392d313f4a1e146d1d78a4fd20cf3695b;hpb=1932a135cf8cedcea2d0f2d5be21edd7fe306251;p=fs%2Flustre-release.git diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c index f00f4f0..863f98b 100644 --- a/lustre/llite/xattr.c +++ b/lustre/llite/xattr.c @@ -26,8 +26,10 @@ * 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. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,6 +40,9 @@ #include #include #include +#ifdef HAVE_SELINUX_IS_ENABLED +#include +#endif #define DEBUG_SUBSYSTEM S_LLITE @@ -45,7 +50,6 @@ #include #include #include -//#include #include #include "llite_internal.h" @@ -94,6 +98,8 @@ int xattr_type_filter(struct ll_sb_info *sbi, int xattr_type) !(sbi->ll_flags & LL_SBI_ACL)) return -EOPNOTSUPP; + if (xattr_type == XATTR_SECURITY_T && !selinux_is_enabled()) + return -EOPNOTSUPP; if (xattr_type == XATTR_USER_T && !(sbi->ll_flags & LL_SBI_USER_XATTR)) return -EOPNOTSUPP; if (xattr_type == XATTR_TRUSTED_T && !cfs_capable(CFS_CAP_SYS_ADMIN)) @@ -129,6 +135,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 || @@ -222,10 +233,10 @@ int ll_setxattr(struct dentry *dentry, const char *name, /* 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) + if (lump != NULL && lump->lmm_stripe_offset == 0) lump->lmm_stripe_offset = -1; - if (S_ISREG(inode->i_mode)) { + if (lump != NULL && S_ISREG(inode->i_mode)) { struct file f; int flags = FMODE_WRITE; @@ -293,6 +304,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 || @@ -315,9 +331,9 @@ int ll_getxattr_common(struct inode *inode, const char *name, 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); @@ -358,6 +374,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); @@ -419,20 +438,41 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name, struct ptlrpc_request *request = NULL; 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 { - rc = -ENODATA; + /* 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 %d > %d for %s (%s)\n", @@ -445,7 +485,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); } @@ -468,12 +511,11 @@ 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) + if (ll_i2info(inode)->lli_smd == NULL) rc2 = -1; } else if (S_ISDIR(inode->i_mode)) { rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request); @@ -481,7 +523,7 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size) 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;