X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=8185a558d0446cbbf653361029b26efbea2fb3b5;hb=f5ecf580adc319fd9abe41bd79389b50015d5c13;hp=8e646b29400c1c7f6d62edc0bbaa7b46a2bfbab0;hpb=d2a191d6f14c875a918cc8836cb7e3fd12bbfdbc;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index 8e646b2..8185a55 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,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, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,9 +43,6 @@ * Author: Huang Hua */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MDS #include @@ -62,7 +59,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) static const char user_string[] = "user."; int size, rc; ENTRY; - + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETXATTR_PACK)) RETURN(-ENOMEM); @@ -75,7 +72,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) if (!(req->rq_export->exp_connect_flags & OBD_CONNECT_XATTR) && !strncmp(xattr_name, user_string, sizeof(user_string) - 1)) RETURN(-EOPNOTSUPP); - + size = mo_xattr_get(info->mti_env, mdt_object_child(info->mti_object), &LU_BUF_NULL, xattr_name); @@ -88,13 +85,11 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) RETURN(-EINVAL); } - if (size < 0) { - if (size == -ENODATA) - size = 0; - else if (size != -EOPNOTSUPP) { - CDEBUG(D_INFO, "Error geting EA size: %d\n", size); - RETURN(size); - } + if (size == -ENODATA) { + size = 0; + } else if (size < 0) { + CERROR("Error geting EA size: %d\n", size); + RETURN(size); } if (info->mti_body->eadatasize != 0 && @@ -102,8 +97,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) RETURN(-ERANGE); req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER, - min_t(int, size, info->mti_body->eadatasize)); - + info->mti_body->eadatasize == 0 ? 0 : size); rc = req_capsule_server_pack(pill); if (rc) { LASSERT(rc < 0); @@ -117,7 +111,7 @@ int mdt_getxattr(struct mdt_thread_info *info) { struct ptlrpc_request *req = mdt_info_req(info); struct mdt_export_data *med = mdt_req2med(req); - struct md_ucred *uc = mdt_ucred(info); + struct lu_ucred *uc = mdt_ucred(info); struct mdt_body *reqbody; struct mdt_body *repbody = NULL; struct md_object *next; @@ -136,7 +130,7 @@ int mdt_getxattr(struct mdt_thread_info *info) if (reqbody == NULL) RETURN(err_serious(-EFAULT)); - rc = mdt_init_ucred(info, reqbody); + rc = mdt_init_ucred(info, reqbody); if (rc) RETURN(err_serious(rc)); @@ -146,8 +140,8 @@ int mdt_getxattr(struct mdt_thread_info *info) if (unlikely(!remote)) GOTO(out, rc = err_serious(-EINVAL)); - perm = mdt_identity_get_perm(uc->mu_identity, remote, - req->rq_peer.nid); + perm = mdt_identity_get_perm(uc->uc_identity, remote, + req->rq_peer.nid); if (!(perm & CFS_RMTACL_PERM)) GOTO(out, rc = err_serious(-EPERM)); @@ -168,6 +162,7 @@ int mdt_getxattr(struct mdt_thread_info *info) if (easize == 0 || reqbody->eadatasize == 0) GOTO(out, rc = easize); + buf = &info->mti_buf; buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_EADATA); buf->lb_len = easize; @@ -215,6 +210,7 @@ int mdt_getxattr(struct mdt_thread_info *info) EXIT; out: if (rc >= 0) { + mdt_counter_incr(req, LPROC_MDT_GETXATTR); repbody->eadatasize = rc; rc = 0; } @@ -230,7 +226,7 @@ static int mdt_rmtlsetfacl(struct mdt_thread_info *info, { struct ptlrpc_request *req = mdt_info_req(info); struct mdt_export_data *med = mdt_req2med(req); - struct md_ucred *uc = mdt_ucred(info); + struct lu_ucred *uc = mdt_ucred(info); struct lu_buf *buf = &info->mti_buf; int rc; ENTRY; @@ -238,7 +234,7 @@ static int mdt_rmtlsetfacl(struct mdt_thread_info *info, rc = lustre_ext_acl_xattr_id2server(uc, med->med_idmap, header); if (rc) RETURN(rc); - + rc = mo_xattr_get(info->mti_env, next, &LU_BUF_NULL, xattr_name); if (rc == -ENODATA) rc = 0; @@ -247,7 +243,7 @@ static int mdt_rmtlsetfacl(struct mdt_thread_info *info, buf->lb_len = rc; if (buf->lb_len > 0) { - OBD_ALLOC(buf->lb_buf, buf->lb_len); + OBD_ALLOC_LARGE(buf->lb_buf, buf->lb_len); if (unlikely(buf->lb_buf == NULL)) RETURN(-ENOMEM); @@ -265,7 +261,7 @@ static int mdt_rmtlsetfacl(struct mdt_thread_info *info, _out: if (rc <= 0 && buf->lb_buf != NULL) - OBD_FREE(buf->lb_buf, buf->lb_len); + OBD_FREE_LARGE(buf->lb_buf, buf->lb_len); return rc; } @@ -273,19 +269,18 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, struct mdt_lock_handle *unused) { struct ptlrpc_request *req = mdt_info_req(info); - struct md_ucred *uc = mdt_ucred(info); + struct lu_ucred *uc = mdt_ucred(info); struct mdt_lock_handle *lh; - struct req_capsule *pill = info->mti_pill; const struct lu_env *env = info->mti_env; struct lu_buf *buf = &info->mti_buf; struct mdt_reint_record *rr = &info->mti_rr; struct md_attr *ma = &info->mti_attr; struct lu_attr *attr = &info->mti_attr.ma_attr; - struct mdt_object *obj; + struct mdt_object *obj; struct md_object *child; __u64 valid = attr->la_valid; - const char *xattr_name; - int xattr_len = 0; + const char *xattr_name = rr->rr_name; + int xattr_len = rr->rr_eadatalen; __u64 lockpart; int rc; posix_acl_xattr_header *new_xattr = NULL; @@ -298,12 +293,10 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR)) RETURN(err_serious(-ENOMEM)); - xattr_name = rr->rr_name; - CDEBUG(D_INODE, "%s xattr %s\n", valid & OBD_MD_FLXATTR ? "set" : "remove", xattr_name); - rc = mdt_init_ucred_reint(info); + rc = mdt_init_ucred_reint(info); if (rc != 0) RETURN(rc); @@ -311,17 +304,12 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, if (unlikely(!remote)) GOTO(out, rc = err_serious(-EINVAL)); - perm = mdt_identity_get_perm(uc->mu_identity, remote, - req->rq_peer.nid); + perm = mdt_identity_get_perm(uc->uc_identity, remote, + req->rq_peer.nid); if (!(perm & CFS_RMTACL_PERM)) GOTO(out, rc = err_serious(-EPERM)); } - /* various sanity check for xattr name */ - xattr_name = req_capsule_client_get(pill, &RMF_NAME); - if (!xattr_name) - GOTO(out, rc = err_serious(-EFAULT)); - if (strncmp(xattr_name, XATTR_USER_PREFIX, sizeof(XATTR_USER_PREFIX) - 1) == 0) { if (!(req->rq_export->exp_connect_flags & OBD_CONNECT_XATTR)) @@ -334,46 +322,54 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, GOTO(out, rc = 0); } else if ((valid & OBD_MD_FLXATTR) && (strncmp(xattr_name, XATTR_NAME_ACL_ACCESS, - sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0)) { + sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0 || + strncmp(xattr_name, XATTR_NAME_ACL_DEFAULT, + sizeof(XATTR_NAME_ACL_DEFAULT) - 1) == 0)) { /* currently lustre limit acl access size */ - xattr_len = req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT); - if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE) GOTO(out, -ERANGE); } lockpart = MDS_INODELOCK_UPDATE; + /* Revoke all clients' lookup lock, since the access + * permissions for this inode is changed when ACL_ACCESS is + * set. This isn't needed for ACL_DEFAULT, since that does + * not change the access permissions of this inode, nor any + * other existing inodes. It is setting the ACLs inherited + * by new directories/files at create time. */ if (!strcmp(xattr_name, XATTR_NAME_ACL_ACCESS)) lockpart |= MDS_INODELOCK_LOOKUP; lh = &info->mti_lh[MDT_LH_PARENT]; - mdt_lock_reg_init(lh, LCK_PW); + /* ACLs were sent to clients under LCK_CR locks, so taking LCK_EX + * to cancel them. */ + mdt_lock_reg_init(lh, LCK_EX); obj = mdt_object_find_lock(info, rr->rr_fid1, lh, lockpart); if (IS_ERR(obj)) GOTO(out, rc = PTR_ERR(obj)); + info->mti_mos = obj; + rc = mdt_version_get_check_save(info, obj, 0); + if (rc) + GOTO(out_unlock, rc); + if (unlikely(!(valid & OBD_MD_FLCTIME))) { - CWARN("client miss to set OBD_MD_FLCTIME when " - "setxattr: [object "DFID"] [valid %llu]\n", + /* This isn't strictly an error, but all current clients + * should set OBD_MD_FLCTIME when setting attributes. */ + CWARN("%s: client miss to set OBD_MD_FLCTIME when " + "setxattr %s: [object "DFID"] [valid "LPU64"]\n", + info->mti_exp->exp_obd->obd_name, xattr_name, PFID(rr->rr_fid1), valid); attr->la_ctime = cfs_time_current_sec(); } attr->la_valid = LA_CTIME; child = mdt_object_child(obj); if (valid & OBD_MD_FLXATTR) { - char * xattr; - - if (!req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) { - CDEBUG(D_INFO, "no xattr data supplied\n"); - GOTO(out_unlock, rc = -EFAULT); - } + char *xattr = (void *)rr->rr_eadata; - xattr_len = req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT); - if (xattr_len) { + if (xattr_len > 0) { int flags = 0; - xattr = req_capsule_client_get(pill, &RMF_EADATA); - if (valid & OBD_MD_FLRMTLSETFACL) { if (unlikely(!remote)) GOTO(out_unlock, rc = -EINVAL); @@ -417,12 +413,15 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, CDEBUG(D_INFO, "valid bits: "LPX64"\n", valid); rc = -EINVAL; } + if (rc == 0) + mdt_counter_incr(req, LPROC_MDT_SETXATTR); + EXIT; out_unlock: mdt_object_unlock_put(info, obj, lh, rc); if (unlikely(new_xattr != NULL)) lustre_posix_acl_xattr_free(new_xattr, xattr_len); out: - mdt_exit_ucred(info); - return rc; + mdt_exit_ucred(info); + return rc; }