X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=83ecc742f93311ed2cf4672aed387919b3b21728;hb=6b4fbaefc816644bac03f7ea9840f764ccc2efbd;hp=2d8082182484dada2e5dda9c995cce5e43221060;hpb=5e6d8a3435b6f1123004c14018cbe4c914834109;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index 2d80821..83ecc74 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -47,7 +47,7 @@ /* return EADATA length to the caller. negative value means error */ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) { - struct req_capsule *pill = &info->mti_pill ; + struct req_capsule *pill = info->mti_pill ; struct ptlrpc_request *req = mdt_info_req(info); char *xattr_name; __u64 valid = info->mti_body->valid; @@ -68,18 +68,15 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) !strncmp(xattr_name, user_string, sizeof(user_string) - 1)) RETURN(-EOPNOTSUPP); - if (!strcmp(xattr_name, XATTR_NAME_LUSTRE_ACL)) - size = RMTACL_SIZE_MAX; - else - size = mo_xattr_get(info->mti_env, - mdt_object_child(info->mti_object), - &LU_BUF_NULL, xattr_name); + size = mo_xattr_get(info->mti_env, + mdt_object_child(info->mti_object), + &LU_BUF_NULL, xattr_name); } else if ((valid & OBD_MD_FLXATTRLS) == OBD_MD_FLXATTRLS) { size = mo_xattr_list(info->mti_env, mdt_object_child(info->mti_object), &LU_BUF_NULL); } else { - CERROR("Valid bits: "LPX64"\n", info->mti_body->valid); + CDEBUG(D_INFO, "Valid bits: "LPX64"\n", info->mti_body->valid); RETURN(-EINVAL); } @@ -87,7 +84,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) if (size == -ENODATA) size = 0; else if (size != -EOPNOTSUPP) { - CERROR("Error geting EA size: %d\n", size); + CDEBUG(D_INFO, "Error geting EA size: %d\n", size); RETURN(size); } } @@ -99,7 +96,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER, min_t(int, size, info->mti_body->eadatasize)); - rc = req_capsule_pack(pill); + rc = req_capsule_server_pack(pill); if (rc) { LASSERT(rc < 0); RETURN(rc); @@ -108,36 +105,15 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) RETURN(size); } -static int do_remote_getfacl(struct mdt_thread_info *info, struct lu_buf *buf) -{ - struct ptlrpc_request *req = mdt_info_req(info); - char *cmd; - int rc; - ENTRY; - - if (!buf->lb_buf || (buf->lb_len != RMTACL_SIZE_MAX)) - RETURN(-EINVAL); - - cmd = req_capsule_client_get(&info->mti_pill, &RMF_EADATA); - if (!cmd) { - CERROR("missing getfacl command!\n"); - RETURN(-EFAULT); - } - - rc = mdt_rmtacl_upcall(info, cmd, buf); - if (rc) - CERROR("remote acl upcall failed: %d\n", rc); - - lustre_shrink_reply(req, REPLY_REC_OFF + 1, strlen(buf->lb_buf) + 1, 0); - RETURN(rc ?: strlen(buf->lb_buf) + 1); -} - int mdt_getxattr(struct mdt_thread_info *info) { - struct mdt_body *reqbody; - struct mdt_body *repbody = NULL; - struct md_object *next; - struct lu_buf *buf; + struct ptlrpc_request *req = mdt_info_req(info); + struct mdt_export_data *med = mdt_req2med(req); + struct md_ucred *uc = mdt_ucred(info); + struct mdt_body *reqbody; + struct mdt_body *repbody = NULL; + struct md_object *next; + struct lu_buf *buf; int easize, rc; ENTRY; @@ -146,7 +122,7 @@ int mdt_getxattr(struct mdt_thread_info *info) CDEBUG(D_INODE, "getxattr "DFID"\n", PFID(&info->mti_body->fid1)); - reqbody = req_capsule_client_get(&info->mti_pill, &RMF_MDT_BODY); + reqbody = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY); if (reqbody == NULL) RETURN(err_serious(-EFAULT)); @@ -154,11 +130,28 @@ int mdt_getxattr(struct mdt_thread_info *info) if (rc) RETURN(err_serious(rc)); + next = mdt_object_child(info->mti_object); + + if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) { + __u32 perm = mdt_identity_get_perm(uc->mu_identity, + med->med_rmtclient, + req->rq_peer.nid); + + LASSERT(med->med_rmtclient); + if (!(perm & CFS_RMTACL_PERM)) + GOTO(out, rc = err_serious(-EPERM)); + + rc = mo_permission(info->mti_env, NULL, next, NULL, + MAY_RGETFACL); + if (rc) + GOTO(out, rc = err_serious(rc)); + } + easize = mdt_getxattr_pack_reply(info); if (easize < 0) GOTO(out, rc = err_serious(easize)); - repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY); + repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY); LASSERT(repbody != NULL); /* No need further getxattr. */ @@ -166,28 +159,44 @@ int mdt_getxattr(struct mdt_thread_info *info) GOTO(out, rc = easize); buf = &info->mti_buf; - buf->lb_buf = req_capsule_server_get(&info->mti_pill, &RMF_EADATA); + buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_EADATA); buf->lb_len = easize; - next = mdt_object_child(info->mti_object); if (info->mti_body->valid & OBD_MD_FLXATTR) { - char *xattr_name = req_capsule_client_get(&info->mti_pill, + int flags = CFS_IC_NOTHING; + char *xattr_name = req_capsule_client_get(info->mti_pill, &RMF_NAME); CDEBUG(D_INODE, "getxattr %s\n", xattr_name); - if (!strcmp(xattr_name, XATTR_NAME_LUSTRE_ACL)) - rc = do_remote_getfacl(info, buf); - else - rc = mo_xattr_get(info->mti_env, next, buf, xattr_name); - - if (rc < 0) + rc = mo_xattr_get(info->mti_env, next, buf, xattr_name); + if (rc < 0) { CERROR("getxattr failed: %d\n", rc); + GOTO(out, rc); + } + + if (info->mti_body->valid & + (OBD_MD_FLRMTLSETFACL | OBD_MD_FLRMTLGETFACL)) + flags = CFS_IC_ALL; + else if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) + flags = CFS_IC_MAPPED; + + if (rc > 0 && flags != CFS_IC_NOTHING) { + int rc1; + + LASSERT(med->med_rmtclient); + rc1 = lustre_posix_acl_xattr_id2client(uc, + med->med_idmap, + (posix_acl_xattr_header *)(buf->lb_buf), + rc, flags); + if (unlikely(rc1 < 0)) + rc = rc1; + } } else if (info->mti_body->valid & OBD_MD_FLXATTRLS) { CDEBUG(D_INODE, "listxattr\n"); rc = mo_xattr_list(info->mti_env, next, buf); if (rc < 0) - CERROR("listxattr failed: %d\n", rc); + CDEBUG(D_INFO, "listxattr failed: %d\n", rc); } else LBUG(); @@ -201,108 +210,106 @@ out: return rc; } -/* return EADATA length to the caller. negative value means error */ -static int mdt_setxattr_pack_reply(struct mdt_thread_info * info) -{ - struct req_capsule *pill = &info->mti_pill ; - __u64 valid = info->mti_body->valid; - int rc = 0, rc1; - - if ((valid & OBD_MD_FLXATTR) == OBD_MD_FLXATTR) { - char *xattr_name; - - xattr_name = req_capsule_client_get(pill, &RMF_NAME); - if (!xattr_name) - return -EFAULT; - - if (!strcmp(xattr_name, XATTR_NAME_LUSTRE_ACL)) - rc = RMTACL_SIZE_MAX; - } - - req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER, rc); - - rc1 = req_capsule_pack(pill); - - return rc = rc1 ? rc1 : rc; -} - -static int do_remote_setfacl(struct mdt_thread_info *info) +static int mdt_rmtlsetfacl(struct mdt_thread_info *info, + struct md_object *next, + const char *xattr_name, + ext_acl_xattr_header *header, + posix_acl_xattr_header **out) { - struct ptlrpc_request *req = mdt_info_req(info); - struct lu_buf *buf = &info->mti_buf; - char *cmd; - int rc; + 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_buf *buf = &info->mti_buf; + int rc; ENTRY; - cmd = req_capsule_client_get(&info->mti_pill, &RMF_EADATA); - if (!cmd) { - CERROR("missing setfacl command!\n"); - RETURN(-EFAULT); - } + 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; + else if (rc < 0) + RETURN(rc); - buf->lb_buf = req_capsule_server_get(&info->mti_pill, &RMF_EADATA); - LASSERT(buf->lb_buf); - buf->lb_len = RMTACL_SIZE_MAX; + buf->lb_len = rc; + if (buf->lb_len > 0) { + OBD_ALLOC(buf->lb_buf, buf->lb_len); + if (unlikely(buf->lb_buf == NULL)) + RETURN(-ENOMEM); - rc = mdt_rmtacl_upcall(info, cmd, buf); - if (rc) - CERROR("remote acl upcall failed: %d\n", rc); + rc = mo_xattr_get(info->mti_env, next, buf, xattr_name); + if (rc < 0) { + CERROR("getxattr failed: %d\n", rc); + GOTO(_out, rc); + } + } else + buf->lb_buf = NULL; - lustre_shrink_reply(req, REPLY_REC_OFF, strlen(buf->lb_buf) + 1, 0); - RETURN(rc); + rc = lustre_acl_xattr_merge2posix((posix_acl_xattr_header *)(buf->lb_buf), + buf->lb_len, header, out); + EXIT; + +_out: + if (rc <= 0 && buf->lb_buf != NULL) + OBD_FREE(buf->lb_buf, buf->lb_len); + return rc; } -int mdt_setxattr(struct mdt_thread_info *info) +int mdt_reint_setxattr(struct mdt_thread_info *info, + struct mdt_lock_handle *unused) { struct ptlrpc_request *req = mdt_info_req(info); - struct mdt_body *reqbody; + struct mdt_export_data *med = mdt_req2med(req); + struct md_ucred *uc = mdt_ucred(info); const char user_string[] = "user."; const char trust_string[] = "trusted."; struct mdt_lock_handle *lh; - struct req_capsule *pill = &info->mti_pill; - struct mdt_object *obj = info->mti_object; - struct mdt_body *body = (struct mdt_body *)info->mti_body; + struct req_capsule *pill = info->mti_pill; const struct lu_env *env = info->mti_env; - struct md_object *child = mdt_object_child(obj); struct lu_buf *buf = &info->mti_buf; - __u64 valid = body->valid; - char *xattr_name; - int xattr_len; + struct mdt_reint_record *rr = &info->mti_rr; + struct lu_attr *attr = &info->mti_attr.ma_attr; + struct mdt_object *obj; + struct md_object *child; + __u64 valid = attr->la_valid; + const char *xattr_name; + int xattr_len = 0; __u64 lockpart; int rc; + posix_acl_xattr_header *new_xattr = NULL; ENTRY; - CDEBUG(D_INODE, "setxattr "DFID"\n", PFID(&body->fid1)); + CDEBUG(D_INODE, "setxattr for "DFID"\n", PFID(rr->rr_fid1)); if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR)) RETURN(err_serious(-ENOMEM)); - reqbody = req_capsule_client_get(pill, &RMF_MDT_BODY); - if (reqbody == NULL) - RETURN(err_serious(-EFAULT)); + xattr_name = rr->rr_name; - rc = mdt_init_ucred(info, reqbody); - if (rc) - RETURN(err_serious(rc)); + CDEBUG(D_INODE, "%s xattr %s\n", + valid & OBD_MD_FLXATTR ? "set" : "remove", xattr_name); - rc = mdt_setxattr_pack_reply(info); - if (rc < 0) - GOTO(out, rc = err_serious(rc)); + rc = mdt_init_ucred_reint(info); + if (rc != 0) + RETURN(rc); + + if (valid & OBD_MD_FLRMTRSETFACL) { + __u32 perm = mdt_identity_get_perm(uc->mu_identity, + med->med_rmtclient, + req->rq_peer.nid); + + LASSERT(med->med_rmtclient); + 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)); - CDEBUG(D_INODE, "%s xattr %s\n", - body->valid & OBD_MD_FLXATTR ? "set" : "remove", xattr_name); - - if (((valid & OBD_MD_FLXATTR) == OBD_MD_FLXATTR) && - (!strcmp(xattr_name, XATTR_NAME_LUSTRE_ACL))) { - rc = do_remote_setfacl(info); - GOTO(out, rc); - } - if (strncmp(xattr_name, trust_string, sizeof(trust_string) - 1) == 0) { if (strcmp(xattr_name + 8, XATTR_NAME_LOV) == 0) GOTO(out, rc = -EACCES); @@ -319,26 +326,41 @@ int mdt_setxattr(struct mdt_thread_info *info) lh = &info->mti_lh[MDT_LH_PARENT]; mdt_lock_reg_init(lh, LCK_PW); - rc = mdt_object_lock(info, obj, lh, lockpart, MDT_LOCAL_LOCK); - if (rc != 0) - GOTO(out, rc); + obj = mdt_object_find_lock(info, rr->rr_fid1, lh, lockpart); + if (IS_ERR(obj)) + GOTO(out, rc = PTR_ERR(obj)); + child = mdt_object_child(obj); if ((valid & OBD_MD_FLXATTR) == OBD_MD_FLXATTR) { char * xattr; + if (!req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) { - CERROR("no xattr data supplied\n"); + 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) { int flags = 0; + xattr = req_capsule_client_get(pill, &RMF_EADATA); - if (body->flags & XATTR_REPLACE) + if (valid & OBD_MD_FLRMTLSETFACL) { + LASSERT(med->med_rmtclient); + xattr_len = mdt_rmtlsetfacl(info, child, + xattr_name, + (ext_acl_xattr_header *)xattr, + &new_xattr); + if (xattr_len < 0) + GOTO(out_unlock, rc = xattr_len); + + xattr = (char *)new_xattr; + } + + if (attr->la_flags & XATTR_REPLACE) flags |= LU_XATTR_REPLACE; - if (body->flags & XATTR_CREATE) + if (attr->la_flags & XATTR_CREATE) flags |= LU_XATTR_CREATE; mdt_fail_write(env, info->mti_mdt->mdt_bottom, @@ -351,12 +373,14 @@ int mdt_setxattr(struct mdt_thread_info *info) } else if ((valid & OBD_MD_FLXATTRRM) == OBD_MD_FLXATTRRM) { rc = mo_xattr_del(env, child, xattr_name); } else { - CERROR("valid bits: "LPX64"\n", body->valid); + CDEBUG(D_INFO, "valid bits: "LPX64"\n", valid); rc = -EINVAL; } EXIT; out_unlock: - mdt_object_unlock(info, obj, lh, rc); + 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;