X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fxattr.c;h=eecff6358f675c6e17d0f94bde2fc8e6548805a8;hp=db7deb75167b94e735d8d68252468d8e9f309c06;hb=219e03a261e510e1551ab0695633cc4d2f5196fb;hpb=7358e0b344f8455f1a07fffeb4ae2dd2a85b47b3 diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c index db7deb7..eecff63 100644 --- a/lustre/llite/xattr.c +++ b/lustre/llite/xattr.c @@ -1,22 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2004 - 2005 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License + * 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 + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #include @@ -31,15 +46,10 @@ #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) @@ -79,15 +89,14 @@ int get_xattr_type(const char *name) static int xattr_type_filter(struct ll_sb_info *sbi, int xattr_type) { - if (((xattr_type == XATTR_ACL_ACCESS_T) || - (xattr_type == XATTR_ACL_DEFAULT_T)) && - (!(sbi->ll_flags & LL_SBI_ACL) || - (sbi->ll_flags & LL_SBI_RMT_CLIENT))) + if ((xattr_type == XATTR_ACL_ACCESS_T || + xattr_type == XATTR_ACL_DEFAULT_T) && + !(sbi->ll_flags & LL_SBI_ACL)) return -EOPNOTSUPP; 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; @@ -104,6 +113,10 @@ int ll_setxattr_common(struct inode *inode, const char *name, struct ptlrpc_request *req; int xattr_type, rc; struct obd_capa *oc; + posix_acl_xattr_header *new_value = NULL; + struct rmtacl_ctl_entry *rce = NULL; + ext_acl_xattr_header *acl = NULL; + const char *pv = value; ENTRY; xattr_type = get_xattr_type(name); @@ -116,14 +129,65 @@ int ll_setxattr_common(struct inode *inode, const char *name, (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0)) RETURN(0); +#ifdef CONFIG_FS_POSIX_ACL + if (sbi->ll_flags & LL_SBI_RMT_CLIENT && + (xattr_type == XATTR_ACL_ACCESS_T || + xattr_type == XATTR_ACL_DEFAULT_T)) { + rce = rct_search(&sbi->ll_rct, cfs_curproc_pid()); + if (rce == NULL || + (rce->rce_ops != RMT_LSETFACL && + rce->rce_ops != RMT_RSETFACL)) + RETURN(-EOPNOTSUPP); + + if (rce->rce_ops == RMT_LSETFACL) { + struct eacl_entry *ee; + + ee = et_search_del(&sbi->ll_et, cfs_curproc_pid(), + ll_inode2fid(inode), xattr_type); + LASSERT(ee != NULL); + if (valid & OBD_MD_FLXATTR) { + acl = lustre_acl_xattr_merge2ext( + (posix_acl_xattr_header *)value, + size, ee->ee_acl); + if (IS_ERR(acl)) { + ee_free(ee); + RETURN(PTR_ERR(acl)); + } + size = CFS_ACL_XATTR_SIZE(\ + le32_to_cpu(acl->a_count), \ + ext_acl_xattr); + pv = (const char *)acl; + } + ee_free(ee); + } else if (rce->rce_ops == RMT_RSETFACL) { + size = lustre_posix_acl_xattr_filter( + (posix_acl_xattr_header *)value, + size, &new_value); + if (unlikely(size < 0)) + RETURN(size); + + pv = (const char *)new_value; + } else + RETURN(-EOPNOTSUPP); + + valid |= rce_ops2valid(rce->rce_ops); + } +#endif oc = ll_mdscapa_get(inode); - rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode), oc, valid, name, - value, size, 0, flags, &req); + rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode), oc, + valid, name, pv, size, 0, flags, ll_i2suppgid(inode), + &req); capa_put(oc); +#ifdef CONFIG_FS_POSIX_ACL + if (new_value != NULL) + lustre_posix_acl_xattr_free(new_value, size); + if (acl != NULL) + lustre_ext_acl_xattr_free(acl); +#endif 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); @@ -146,30 +210,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); @@ -200,6 +273,7 @@ int ll_getxattr_common(struct inode *inode, const char *name, int xattr_type, rc; void *xdata; struct obd_capa *oc; + struct rmtacl_ctl_entry *rce = NULL; ENTRY; CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", @@ -219,18 +293,31 @@ int ll_getxattr_common(struct inode *inode, const char *name, if (rc) RETURN(rc); +#ifdef CONFIG_FS_POSIX_ACL + if (sbi->ll_flags & LL_SBI_RMT_CLIENT && + (xattr_type == XATTR_ACL_ACCESS_T || + xattr_type == XATTR_ACL_DEFAULT_T)) { + rce = rct_search(&sbi->ll_rct, cfs_curproc_pid()); + if (rce == NULL || + (rce->rce_ops != RMT_LSETFACL && + rce->rce_ops != RMT_LGETFACL && + rce->rce_ops != RMT_RSETFACL && + rce->rce_ops != RMT_RGETFACL)) + RETURN(-EOPNOTSUPP); + } + /* 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) { + 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); @@ -239,25 +326,27 @@ int ll_getxattr_common(struct inode *inode, const char *name, posix_acl_release(acl); RETURN(rc); } + if (xattr_type == XATTR_ACL_DEFAULT_T && !S_ISDIR(inode->i_mode)) + RETURN(-ENODATA); #endif do_getxattr: oc = ll_mdscapa_get(inode); - rc = md_getxattr(sbi->ll_md_exp, ll_inode2fid(inode), oc, valid, name, - NULL, 0, size, 0, &req); + rc = md_getxattr(sbi->ll_md_exp, ll_inode2fid(inode), oc, + valid | (rce ? rce_ops2valid(rce->rce_ops) : 0), + name, NULL, 0, size, 0, &req); capa_put(oc); 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); } - body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*body)); + body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); LASSERT(body); - LASSERT_REPSWABBED(req, REPLY_REC_OFF); /* only detect the xattr size */ if (size == 0) @@ -269,28 +358,44 @@ do_getxattr: GOTO(out, rc = -ERANGE); } - if (lustre_msg_bufcount(req->rq_repmsg) < 3) { - CERROR("reply bufcount %u\n", - lustre_msg_bufcount(req->rq_repmsg)); - GOTO(out, rc = -EFAULT); - } + if (body->eadatasize == 0) + GOTO(out, rc = -ENODATA); /* do not need swab xattr data */ - LASSERT_REPSWAB(req, REPLY_REC_OFF + 1); - xdata = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, - body->eadatasize); - if (!xdata) { - CERROR("can't extract: %u : %u\n", body->eadatasize, - lustre_msg_buflen(req->rq_repmsg, REPLY_REC_OFF + 1)); + xdata = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, + body->eadatasize); + if (!xdata) GOTO(out, rc = -EFAULT); + +#ifdef CONFIG_FS_POSIX_ACL + if (body->eadatasize >= 0 && rce && rce->rce_ops == RMT_LSETFACL) { + ext_acl_xattr_header *acl; + + acl = lustre_posix_acl_xattr_2ext((posix_acl_xattr_header *)xdata, + body->eadatasize); + if (IS_ERR(acl)) + GOTO(out, rc = PTR_ERR(acl)); + + rc = ee_add(&sbi->ll_et, cfs_curproc_pid(), ll_inode2fid(inode), + xattr_type, acl); + if (unlikely(rc < 0)) { + lustre_ext_acl_xattr_free(acl); + GOTO(out, rc); + } } +#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); - RETURN(rc); + return rc; } ssize_t ll_getxattr(struct dentry *dentry, const char *name, @@ -306,23 +411,25 @@ 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, + 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); + } else { + rc = -ENODATA; } if (rc < 0) @@ -331,8 +438,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name, 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); } @@ -370,7 +477,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) - rc2 = -1; + rc2 = -1; } else if (S_ISDIR(inode->i_mode)) { rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request); } @@ -393,7 +500,6 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size) out: ptlrpc_req_finished(request); rc = rc + rc2; - + return rc; } -