X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=7d0ac80ba9f1b9c6cf422e7f69560e888103b949;hb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;hp=0db7f3360e3e4c5c6d7410bfd4b4764e13965bab;hpb=0d32c314de30932a1a6785887770086cb2d73c40;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index 0db7f33..7d0ac80 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. @@ -28,6 +26,8 @@ /* * 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/ @@ -43,9 +43,6 @@ * Author: Huang Hua */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MDS #include @@ -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); @@ -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,7 +210,7 @@ int mdt_getxattr(struct mdt_thread_info *info) EXIT; out: if (rc >= 0) { - mdt_counter_incr(req->rq_export, LPROC_MDT_GETXATTR); + mdt_counter_incr(req, LPROC_MDT_GETXATTR); repbody->eadatasize = rc; rc = 0; } @@ -276,17 +271,16 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, struct ptlrpc_request *req = mdt_info_req(info); struct md_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; @@ -299,8 +293,6 @@ 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); @@ -318,11 +310,6 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, 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)) @@ -335,15 +322,21 @@ 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; @@ -361,27 +354,22 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, GOTO(out_unlock, rc); if (unlikely(!(valid & OBD_MD_FLCTIME))) { - CWARN("client miss to set OBD_MD_FLCTIME when " - "setxattr: [object "DFID"] [valid "LPU64"]\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; + char *xattr = (void *)rr->rr_eadata; - if (!req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) { - CDEBUG(D_INFO, "no xattr data supplied\n"); - GOTO(out_unlock, rc = -EFAULT); - } - - 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); @@ -426,7 +414,7 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, rc = -EINVAL; } if (rc == 0) - mdt_counter_incr(req->rq_export, LPROC_MDT_SETXATTR); + mdt_counter_incr(req, LPROC_MDT_SETXATTR); EXIT; out_unlock: