X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=55f052010e43c701ddd3e298f712fbb76a47eb7a;hb=ebfc6f4b54961e5e0762af7d2555f2dc5d1e1ec3;hp=03ffc64d674820672d12296a6c44633384706e7c;hpb=e53d1c18ea9f8c08d55d573e8f0993e582c44c20;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index 03ffc64..55f0520 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -101,10 +101,6 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) RETURN(size); } - if (info->mti_body->eadatasize != 0 && - info->mti_body->eadatasize < size) - RETURN(-ERANGE); - req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER, info->mti_body->eadatasize == 0 ? 0 : size); rc = req_capsule_server_pack(pill); @@ -159,11 +155,70 @@ out: return rc; } -int mdt_getxattr(struct mdt_thread_info *info) +static int mdt_getxattr_all(struct mdt_thread_info *info, + struct mdt_body *reqbody, struct mdt_body *repbody, + struct lu_buf *buf, struct md_object *next) { - struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_export_data *med = mdt_req2med(req); + const struct lu_env *env = info->mti_env; + struct ptlrpc_request *req = mdt_info_req(info); + struct mdt_export_data *med = mdt_req2med(req); struct lu_ucred *uc = mdt_ucred(info); + char *v, *b, *eadatahead, *eadatatail; + __u32 *sizes; + int eadatasize, eavallen = 0, eavallens = 0, rc; + + ENTRY; + + /* + * The format of the pill is the following: + * EADATA: attr1\0attr2\0...attrn\0 + * EAVALS: val1val2...valn + * EAVALS_LENS: 4,4,...4 + */ + + eadatahead = buf->lb_buf; + + /* Fill out EADATA first */ + eadatasize = mo_xattr_list(env, next, buf); + if (eadatasize < 0) + GOTO(out, rc = eadatasize); + + eadatatail = eadatahead + eadatasize; + + v = req_capsule_server_get(info->mti_pill, &RMF_EAVALS); + sizes = req_capsule_server_get(info->mti_pill, &RMF_EAVALS_LENS); + + /* Fill out EAVALS and EAVALS_LENS */ + for (b = eadatahead; b < eadatatail; b += strlen(b) + 1, v += rc) { + buf->lb_buf = v; + buf->lb_len = reqbody->eadatasize - eavallen; + rc = mdt_getxattr_one(info, b, next, buf, med, uc); + if (rc < 0) + GOTO(out, rc); + + sizes[eavallens] = rc; + eavallens++; + eavallen += rc; + } + + repbody->aclsize = eavallen; + repbody->max_mdsize = eavallens; + + req_capsule_shrink(info->mti_pill, &RMF_EAVALS, eavallen, RCL_SERVER); + req_capsule_shrink(info->mti_pill, &RMF_EAVALS_LENS, + eavallens * sizeof(__u32), RCL_SERVER); + req_capsule_shrink(info->mti_pill, &RMF_EADATA, eadatasize, RCL_SERVER); + + GOTO(out, rc = eadatasize); +out: + return rc; +} + +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 lu_ucred *uc = lu_ucred(info->mti_env); struct mdt_body *reqbody; struct mdt_body *repbody = NULL; struct md_object *next; @@ -187,8 +242,6 @@ int mdt_getxattr(struct mdt_thread_info *info) if (rc) RETURN(err_serious(rc)); - down_read(&info->mti_object->mot_xattr_sem); - next = mdt_object_child(info->mti_object); if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) { @@ -234,57 +287,13 @@ int mdt_getxattr(struct mdt_thread_info *info) if (rc < 0) CDEBUG(D_INFO, "listxattr failed: %d\n", rc); } else if (valid == OBD_MD_FLXATTRALL) { - /* - * The format of the pill is the following: - * EADATA: attr1\0attr2\0...attrn\0 - * EAVALS: val1val2...valn - * EAVALS_LENS: 4,4,...4 - */ - char *v, *b; - __u32 *sizes; - int eadatasize, eavallen = 0, eavallens = 0; - struct lu_buf buf2 = { .lb_len = reqbody->eadatasize }; - - /* Fill out EADATA */ - eadatasize = mo_xattr_list(info->mti_env, next, buf); - if (eadatasize < 0) - GOTO(out, rc = eadatasize); - - v = req_capsule_server_get(info->mti_pill, &RMF_EAVALS); - sizes = req_capsule_server_get(info->mti_pill, - &RMF_EAVALS_LENS); - - /* Fill out EAVALS and EAVALS_LENS */ - for (b = buf->lb_buf; - b < (char *)buf->lb_buf + eadatasize; - b += strlen(b) + 1, v += rc) { - buf2.lb_buf = v; - rc = mdt_getxattr_one(info, b, next, &buf2, med, uc); - if (rc < 0) - GOTO(out, rc); - sizes[eavallens] = rc; - buf2.lb_len -= rc; - eavallens++; - eavallen += rc; - } - - repbody->aclsize = eavallen; - repbody->max_mdsize = eavallens; - - req_capsule_shrink(info->mti_pill, &RMF_EAVALS, - eavallen, RCL_SERVER); - req_capsule_shrink(info->mti_pill, &RMF_EAVALS_LENS, - eavallens * sizeof(__u32), RCL_SERVER); - req_capsule_shrink(info->mti_pill, &RMF_EADATA, - eadatasize, RCL_SERVER); - rc = eadatasize; + rc = mdt_getxattr_all(info, reqbody, repbody, + buf, next); } else LBUG(); EXIT; out: - up_read(&info->mti_object->mot_xattr_sem); - if (rc >= 0) { mdt_counter_incr(req, LPROC_MDT_GETXATTR); repbody->eadatasize = rc; @@ -344,8 +353,8 @@ _out: int mdt_reint_setxattr(struct mdt_thread_info *info, struct mdt_lock_handle *unused) { - struct ptlrpc_request *req = mdt_info_req(info); - struct lu_ucred *uc = mdt_ucred(info); + struct ptlrpc_request *req = mdt_info_req(info); + struct lu_ucred *uc = lu_ucred(info->mti_env); struct mdt_lock_handle *lh; const struct lu_env *env = info->mti_env; struct lu_buf *buf = &info->mti_buf; @@ -355,7 +364,7 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, struct mdt_object *obj; struct md_object *child; __u64 valid = attr->la_valid; - const char *xattr_name = rr->rr_name; + const char *xattr_name = rr->rr_name.ln_name; int xattr_len = rr->rr_eadatalen; __u64 lockpart; int rc; @@ -366,6 +375,9 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, CDEBUG(D_INODE, "setxattr for "DFID"\n", PFID(rr->rr_fid1)); + if (info->mti_dlm_req) + ldlm_request_cancel(req, info->mti_dlm_req, 0); + if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR)) RETURN(err_serious(-ENOMEM)); @@ -382,29 +394,37 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, perm = mdt_identity_get_perm(uc->uc_identity, remote, req->rq_peer.nid); - if (!(perm & CFS_RMTACL_PERM)) - GOTO(out, rc = err_serious(-EPERM)); - } + if (!(perm & CFS_RMTACL_PERM)) + GOTO(out, rc = err_serious(-EPERM)); + } - if (strncmp(xattr_name, XATTR_USER_PREFIX, - sizeof(XATTR_USER_PREFIX) - 1) == 0) { + if (strncmp(xattr_name, XATTR_USER_PREFIX, + sizeof(XATTR_USER_PREFIX) - 1) == 0) { if (!(exp_connect_flags(req->rq_export) & OBD_CONNECT_XATTR)) GOTO(out, rc = -EOPNOTSUPP); - if (strcmp(xattr_name, XATTR_NAME_LOV) == 0) - GOTO(out, rc = -EACCES); - if (strcmp(xattr_name, XATTR_NAME_LMA) == 0) - GOTO(out, rc = 0); - if (strcmp(xattr_name, XATTR_NAME_LINK) == 0) - GOTO(out, rc = 0); - } else if ((valid & OBD_MD_FLXATTR) && - (strncmp(xattr_name, XATTR_NAME_ACL_ACCESS, - 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 */ - if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE) - GOTO(out, -ERANGE); - } + } else if (strncmp(xattr_name, XATTR_TRUSTED_PREFIX, + sizeof(XATTR_TRUSTED_PREFIX) - 1) == 0) { + + if (!md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN)) + GOTO(out, rc = -EPERM); + + if (strcmp(xattr_name, XATTR_NAME_LOV) == 0 || + strcmp(xattr_name, XATTR_NAME_LMA) == 0 || + strcmp(xattr_name, XATTR_NAME_LMV) == 0 || + strcmp(xattr_name, XATTR_NAME_LINK) == 0 || + strcmp(xattr_name, XATTR_NAME_FID) == 0 || + strcmp(xattr_name, XATTR_NAME_VERSION) == 0 || + strcmp(xattr_name, XATTR_NAME_SOM) == 0 || + strcmp(xattr_name, XATTR_NAME_HSM) == 0 || + strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE) == 0) + GOTO(out, rc = 0); + } else if ((valid & OBD_MD_FLXATTR) && + (strcmp(xattr_name, XATTR_NAME_ACL_ACCESS) == 0 || + strcmp(xattr_name, XATTR_NAME_ACL_DEFAULT) == 0)) { + /* currently lustre limit acl access size */ + if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE) + GOTO(out, rc = -ERANGE); + } lockpart = MDS_INODELOCK_UPDATE; /* Revoke all clients' lookup lock, since the access @@ -416,10 +436,9 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, /* We need revoke both LOOKUP|PERM lock here, see mdt_attr_set. */ if (!strcmp(xattr_name, XATTR_NAME_ACL_ACCESS)) lockpart |= MDS_INODELOCK_PERM | MDS_INODELOCK_LOOKUP; - /* We need to take the lock on behalf of old clients so that newer * clients flush their xattr caches */ - if (!(valid & OBD_MD_FLXATTRLOCKED)) + else lockpart |= MDS_INODELOCK_XATTR; lh = &info->mti_lh[MDT_LH_PARENT]; @@ -430,12 +449,10 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, if (IS_ERR(obj)) GOTO(out, rc = PTR_ERR(obj)); - down_write(&obj->mot_xattr_sem); - - info->mti_mos = obj; - rc = mdt_version_get_check_save(info, obj, 0); - if (rc) - GOTO(out_unlock, rc); + tgt_vbr_obj_set(env, mdt_obj2dt(obj)); + rc = mdt_version_get_check_save(info, obj, 0); + if (rc) + GOTO(out_unlock, rc); if (unlikely(!(valid & OBD_MD_FLCTIME))) { /* This isn't strictly an error, but all current clients @@ -502,7 +519,6 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, EXIT; out_unlock: - up_write(&obj->mot_xattr_sem); mdt_object_unlock_put(info, obj, lh, rc); if (unlikely(new_xattr != NULL)) lustre_posix_acl_xattr_free(new_xattr, xattr_len);