X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=6c5616f6423c7ffec4d251b7e9cea806b0652dcc;hb=3f4ca2cb52dc9c88c8061d8b907b6f793d604f6c;hp=f7c5f606a7acee3db5f2755a7e3b372c7337d93d;hpb=bb2e3278e93dba10626d87f27e0e4b415b44f015;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index f7c5f60..6c5616f 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -63,7 +63,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETXATTR_PACK)) RETURN(-ENOMEM); - valid = info->mti_body->valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS); + valid = info->mti_body->mbo_valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS); /* Determine how many bytes we need */ if (valid == OBD_MD_FLXATTR) { @@ -86,11 +86,12 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) /* N.B. eadatasize = 0 is not valid for FLXATTRALL */ /* We could calculate accurate sizes, but this would * introduce a lot of overhead, let's do it later... */ - size = info->mti_body->eadatasize; + size = info->mti_body->mbo_eadatasize; req_capsule_set_size(pill, &RMF_EAVALS, RCL_SERVER, size); req_capsule_set_size(pill, &RMF_EAVALS_LENS, RCL_SERVER, size); - } else { - CDEBUG(D_INFO, "Valid bits: "LPX64"\n", info->mti_body->valid); + } else { + CDEBUG(D_INFO, "Valid bits: "LPX64"\n", + info->mti_body->mbo_valid); RETURN(-EINVAL); } @@ -101,12 +102,8 @@ 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); + info->mti_body->mbo_eadatasize == 0 ? 0 : size); rc = req_capsule_server_pack(pill); if (rc) { LASSERT(rc < 0); @@ -130,15 +127,13 @@ mdt_getxattr_one(struct mdt_thread_info *info, CDEBUG(D_INODE, "getxattr %s\n", xattr_name); rc = mo_xattr_get(info->mti_env, next, buf, xattr_name); - if (rc < 0) { - CERROR("getxattr failed: %d\n", rc); + if (rc < 0) GOTO(out, rc); - } - if (info->mti_body->valid & + if (info->mti_body->mbo_valid & (OBD_MD_FLRMTLSETFACL | OBD_MD_FLRMTLGETFACL)) flags = CFS_IC_ALL; - else if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) + else if (info->mti_body->mbo_valid & OBD_MD_FLRMTRGETFACL) flags = CFS_IC_MAPPED; if (rc > 0 && flags != CFS_IC_NOTHING) { @@ -195,7 +190,7 @@ static int mdt_getxattr_all(struct mdt_thread_info *info, /* 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; + buf->lb_len = reqbody->mbo_eadatasize - eavallen; rc = mdt_getxattr_one(info, b, next, buf, med, uc); if (rc < 0) GOTO(out, rc); @@ -205,8 +200,8 @@ static int mdt_getxattr_all(struct mdt_thread_info *info, eavallen += rc; } - repbody->aclsize = eavallen; - repbody->max_mdsize = eavallens; + repbody->mbo_aclsize = eavallen; + repbody->mbo_max_mdsize = eavallens; req_capsule_shrink(info->mti_pill, &RMF_EAVALS, eavallen, RCL_SERVER); req_capsule_shrink(info->mti_pill, &RMF_EAVALS_LENS, @@ -220,9 +215,9 @@ out: 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 = mdt_ucred(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; @@ -236,7 +231,7 @@ int mdt_getxattr(struct mdt_thread_info *info) LASSERT(info->mti_object != NULL); LASSERT(lu_object_assert_exists(&info->mti_object->mot_obj)); - CDEBUG(D_INODE, "getxattr "DFID"\n", PFID(&info->mti_body->fid1)); + CDEBUG(D_INODE, "getxattr "DFID"\n", PFID(&info->mti_body->mbo_fid1)); reqbody = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY); if (reqbody == NULL) @@ -248,7 +243,7 @@ int mdt_getxattr(struct mdt_thread_info *info) next = mdt_object_child(info->mti_object); - if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) { + if (info->mti_body->mbo_valid & OBD_MD_FLRMTRGETFACL) { if (unlikely(!remote)) GOTO(out, rc = err_serious(-EINVAL)); @@ -271,14 +266,14 @@ int mdt_getxattr(struct mdt_thread_info *info) LASSERT(repbody != NULL); /* No need further getxattr. */ - if (easize == 0 || reqbody->eadatasize == 0) - GOTO(out, rc = easize); + if (easize == 0 || reqbody->mbo_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; + buf = &info->mti_buf; + buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_EADATA); + buf->lb_len = easize; - valid = info->mti_body->valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS); + valid = info->mti_body->mbo_valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS); if (valid == OBD_MD_FLXATTR) { char *xattr_name = req_capsule_client_get(info->mti_pill, @@ -300,7 +295,7 @@ int mdt_getxattr(struct mdt_thread_info *info) out: if (rc >= 0) { mdt_counter_incr(req, LPROC_MDT_GETXATTR); - repbody->eadatasize = rc; + repbody->mbo_eadatasize = rc; rc = 0; } mdt_exit_ucred(info); @@ -357,8 +352,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; @@ -368,7 +363,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; @@ -398,29 +393,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 @@ -445,10 +448,10 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, 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); + 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