X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_lib.c;h=b3dc46284daa2b3c8ca671188818456eddff1456;hb=feb80fe0c440f7790cc3afa53d048370374a81b1;hp=37cb8f005cac3750d523a8c1581499fbeb75db58;hpb=3192e52a89946f12fd36d28a686c169d01d36e64;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c index 37cb8f0..b3dc462 100644 --- a/lustre/mdt/mdt_lib.c +++ b/lustre/mdt/mdt_lib.c @@ -1,36 +1,49 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * lustre/mdt/mdt_lib.c - * Lustre Metadata Target (mdt) request unpacking helper. + * GPL HEADER START * - * Copyright (c) 2006 Cluster File Systems, Inc. - * Author: Peter Braam - * Author: Andreas Dilger - * Author: Phil Schwan - * Author: Mike Shaver - * Author: Nikita Danilov - * Author: Huang Hua - * Author: Fan Yong + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/mdt/mdt_lib.c + * + * Lustre Metadata Target (mdt) request unpacking helper. + * + * Author: Peter Braam + * Author: Andreas Dilger + * Author: Phil Schwan + * Author: Mike Shaver + * Author: Nikita Danilov + * Author: Huang Hua + * Author: Fan Yong */ @@ -83,18 +96,18 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, struct mdt_device *mdt = info->mti_mdt; struct ptlrpc_user_desc *pud = req->rq_user_desc; struct md_ucred *ucred = mdt_ucred(info); - lnet_nid_t peernid = req->rq_peer.nid; + lnet_nid_t peernid = req->rq_peer.nid; __u32 perm = 0; - int setuid; - int setgid; - int rc = 0; + int setuid; + int setgid; + int rc = 0; ENTRY; LASSERT(req->rq_auth_gss); LASSERT(!req->rq_auth_usr_mdt); LASSERT(req->rq_user_desc); - + ucred->mu_valid = UCRED_INVALID; ucred->mu_o_uid = pud->pud_uid; @@ -112,7 +125,7 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, /* sanity check: we expect the uid which client claimed is true */ if (med->med_rmtclient) { if (req->rq_auth_mapped_uid == INVALID_UID) { - CWARN("remote user not mapped, deny access!\n"); + CDEBUG(D_SEC, "remote user not mapped, deny access!\n"); RETURN(-EACCES); } @@ -120,9 +133,9 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, RETURN(-EACCES); if (req->rq_auth_mapped_uid != pud->pud_uid) { - CERROR("remote client "LPU64": auth/mapped uid %u/%u " - "while client claim %u:%u/%u:%u\n", - peernid, req->rq_auth_uid, + CDEBUG(D_SEC, "remote client %s: auth/mapped uid %u/%u " + "while client claims %u:%u/%u:%u\n", + libcfs_nid2str(peernid), req->rq_auth_uid, req->rq_auth_mapped_uid, pud->pud_uid, pud->pud_gid, pud->pud_fsuid, pud->pud_fsgid); @@ -130,17 +143,18 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, } } else { if (req->rq_auth_uid != pud->pud_uid) { - CERROR("local client "LPU64": auth uid %u " - "while client claim %u:%u/%u:%u\n", - peernid, req->rq_auth_uid, pud->pud_uid, - pud->pud_gid, pud->pud_fsuid, pud->pud_fsgid); + CDEBUG(D_SEC, "local client %s: auth uid %u " + "while client claims %u:%u/%u:%u\n", + libcfs_nid2str(peernid), req->rq_auth_uid, + pud->pud_uid, pud->pud_gid, + pud->pud_fsuid, pud->pud_fsgid); RETURN(-EACCES); } } if (is_identity_get_disabled(mdt->mdt_identity_cache)) { if (med->med_rmtclient) { - CERROR("remote client must run with identity_get " + CDEBUG(D_SEC, "remote client must run with identity_get " "enabled!\n"); RETURN(-EACCES); } else { @@ -149,16 +163,26 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, CFS_SETGRP_PERM; } } else { - ucred->mu_identity = mdt_identity_get(mdt->mdt_identity_cache, - pud->pud_uid); - if (!ucred->mu_identity) { - CERROR("Deny access without identity: uid %d\n", - pud->pud_uid); - RETURN(-EACCES); + struct md_identity *identity; + + identity = mdt_identity_get(mdt->mdt_identity_cache, + pud->pud_uid); + if (IS_ERR(identity)) { + if (unlikely(PTR_ERR(identity) == -EREMCHG && + !med->med_rmtclient)) { + ucred->mu_identity = NULL; + perm = CFS_SETUID_PERM | CFS_SETGID_PERM | + CFS_SETGRP_PERM; + } else { + CDEBUG(D_SEC, "Deny access without identity: uid %u\n", + pud->pud_uid); + RETURN(-EACCES); + } } else { + ucred->mu_identity = identity; perm = mdt_identity_get_perm(ucred->mu_identity, - med->med_rmtclient, - peernid); + med->med_rmtclient, + peernid); } } @@ -170,17 +194,17 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, /* check permission of setuid */ if (setuid && !(perm & CFS_SETUID_PERM)) { - CWARN("mdt blocked setuid attempt (%u -> %u) from " - LPX64"\n", pud->pud_uid, pud->pud_fsuid, peernid); + CDEBUG(D_SEC, "mdt blocked setuid attempt (%u -> %u) from %s\n", + pud->pud_uid, pud->pud_fsuid, libcfs_nid2str(peernid)); GOTO(out, rc = -EACCES); } /* check permission of setgid */ if (setgid && !(perm & CFS_SETGID_PERM)) { - CWARN("mdt blocked setgid attempt (%u:%u/%u:%u -> %u) " - "from "LPX64"\n", pud->pud_uid, pud->pud_gid, - pud->pud_fsuid, pud->pud_fsgid, - ucred->mu_identity->mi_gid, peernid); + CDEBUG(D_SEC, "mdt blocked setgid attempt (%u:%u/%u:%u -> %u) " + "from %s\n", pud->pud_uid, pud->pud_gid, + pud->pud_fsuid, pud->pud_fsgid, + ucred->mu_identity->mi_gid, libcfs_nid2str(peernid)); GOTO(out, rc = -EACCES); } @@ -189,20 +213,20 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, */ if (!med->med_rmtclient && perm & CFS_SETGRP_PERM) { if (pud->pud_ngroups) { - /* setgroups for local client */ + /* setgroups for local client */ ucred->mu_ginfo = groups_alloc(pud->pud_ngroups); if (!ucred->mu_ginfo) { - CERROR("failed to alloc %d groups\n", - pud->pud_ngroups); - GOTO(out, rc = -ENOMEM); - } + CERROR("failed to alloc %d groups\n", + pud->pud_ngroups); + GOTO(out, rc = -ENOMEM); + } lustre_groups_from_list(ucred->mu_ginfo, pud->pud_groups); lustre_groups_sort(ucred->mu_ginfo); - } else { - ucred->mu_ginfo = NULL; - } + } else { + ucred->mu_ginfo = NULL; + } } else { ucred->mu_suppgids[0] = -1; ucred->mu_suppgids[1] = -1; @@ -219,7 +243,7 @@ static int new_init_ucred(struct mdt_thread_info *info, ucred_init_type_t type, /* remove fs privilege for non-root user */ if (ucred->mu_fsuid) - ucred->mu_cap = pud->pud_cap & ~CAP_FS_MASK; + ucred->mu_cap = pud->pud_cap & ~CFS_CAP_FS_MASK; else ucred->mu_cap = pud->pud_cap; ucred->mu_valid = UCRED_NEW; @@ -250,7 +274,7 @@ int mdt_check_ucred(struct mdt_thread_info *info) struct ptlrpc_user_desc *pud = req->rq_user_desc; struct md_ucred *ucred = mdt_ucred(info); struct md_identity *identity = NULL; - lnet_nid_t peernid = req->rq_peer.nid; + lnet_nid_t peernid = req->rq_peer.nid; __u32 perm = 0; int setuid; int setgid; @@ -266,38 +290,38 @@ int mdt_check_ucred(struct mdt_thread_info *info) /* sanity check: if we use strong authentication, we expect the * uid which client claimed is true */ - if (med->med_rmtclient) { - if (req->rq_auth_mapped_uid == INVALID_UID) { - CWARN("remote user not mapped, deny access!\n"); - RETURN(-EACCES); - } + if (med->med_rmtclient) { + if (req->rq_auth_mapped_uid == INVALID_UID) { + CDEBUG(D_SEC, "remote user not mapped, deny access!\n"); + RETURN(-EACCES); + } - if (ptlrpc_user_desc_do_idmap(req, pud)) - RETURN(-EACCES); + if (ptlrpc_user_desc_do_idmap(req, pud)) + RETURN(-EACCES); - if (req->rq_auth_mapped_uid != pud->pud_uid) { - CERROR("remote client "LPU64": auth/mapped uid %u/%u " - "while client claim %u:%u/%u:%u\n", - peernid, req->rq_auth_uid, + if (req->rq_auth_mapped_uid != pud->pud_uid) { + CDEBUG(D_SEC, "remote client %s: auth/mapped uid %u/%u " + "while client claims %u:%u/%u:%u\n", + libcfs_nid2str(peernid), req->rq_auth_uid, req->rq_auth_mapped_uid, pud->pud_uid, pud->pud_gid, pud->pud_fsuid, pud->pud_fsgid); - RETURN(-EACCES); - } - } else { - if (req->rq_auth_uid != pud->pud_uid) { - CERROR("local client "LPU64": auth uid %u " - "while client claim %u:%u/%u:%u\n", - peernid, req->rq_auth_uid, pud->pud_uid, - pud->pud_gid, pud->pud_fsuid, - pud->pud_fsgid); - RETURN(-EACCES); - } + RETURN(-EACCES); + } + } else { + if (req->rq_auth_uid != pud->pud_uid) { + CDEBUG(D_SEC, "local client %s: auth uid %u " + "while client claims %u:%u/%u:%u\n", + libcfs_nid2str(peernid), req->rq_auth_uid, + pud->pud_uid, pud->pud_gid, + pud->pud_fsuid, pud->pud_fsgid); + RETURN(-EACCES); } + } if (is_identity_get_disabled(mdt->mdt_identity_cache)) { if (med->med_rmtclient) { - CERROR("remote client must run with identity_get " + CDEBUG(D_SEC, "remote client must run with identity_get " "enabled!\n"); RETURN(-EACCES); } @@ -305,9 +329,15 @@ int mdt_check_ucred(struct mdt_thread_info *info) } identity = mdt_identity_get(mdt->mdt_identity_cache, pud->pud_uid); - if (!identity) { - CERROR("Deny access without identity: uid %d\n", pud->pud_uid); - RETURN(-EACCES); + if (IS_ERR(identity)) { + if (unlikely(PTR_ERR(identity) == -EREMCHG && + !med->med_rmtclient)) { + RETURN(0); + } else { + CDEBUG(D_SEC, "Deny access without identity: uid %u\n", + pud->pud_uid); + RETURN(-EACCES); + } } perm = mdt_identity_get_perm(identity, med->med_rmtclient, peernid); @@ -318,17 +348,17 @@ int mdt_check_ucred(struct mdt_thread_info *info) /* check permission of setuid */ if (setuid && !(perm & CFS_SETUID_PERM)) { - CWARN("mdt blocked setuid attempt (%u -> %u) from " - LPX64"\n", pud->pud_uid, pud->pud_fsuid, peernid); + CDEBUG(D_SEC, "mdt blocked setuid attempt (%u -> %u) from %s\n", + pud->pud_uid, pud->pud_fsuid, libcfs_nid2str(peernid)); GOTO(out, rc = -EACCES); } /* check permission of setgid */ if (setgid && !(perm & CFS_SETGID_PERM)) { - CWARN("mdt blocked setgid attempt (%u:%u/%u:%u -> %u) " - "from "LPX64"\n", pud->pud_uid, pud->pud_gid, - pud->pud_fsuid, pud->pud_fsgid, identity->mi_gid, - peernid); + CDEBUG(D_SEC, "mdt blocked setgid attempt (%u:%u/%u:%u -> %u) " + "from %s\n", pud->pud_uid, pud->pud_gid, + pud->pud_fsuid, pud->pud_fsgid, identity->mi_gid, + libcfs_nid2str(peernid)); GOTO(out, rc = -EACCES); } @@ -359,10 +389,14 @@ static int old_init_ucred(struct mdt_thread_info *info, if (!is_identity_get_disabled(mdt->mdt_identity_cache)) { identity = mdt_identity_get(mdt->mdt_identity_cache, uc->mu_fsuid); - if (!identity) { - CERROR("Deny access without identity: uid %d\n", - uc->mu_fsuid); - RETURN(-EACCES); + if (IS_ERR(identity)) { + if (unlikely(PTR_ERR(identity) == -EREMCHG)) { + identity = NULL; + } else { + CDEBUG(D_SEC, "Deny access without identity: " + "uid %u\n", uc->mu_fsuid); + RETURN(-EACCES); + } } } uc->mu_identity = identity; @@ -372,7 +406,7 @@ static int old_init_ucred(struct mdt_thread_info *info, /* remove fs privilege for non-root user */ if (uc->mu_fsuid) - uc->mu_cap = body->capability & ~CAP_FS_MASK; + uc->mu_cap = body->capability & ~CFS_CAP_FS_MASK; else uc->mu_cap = body->capability; uc->mu_valid = UCRED_OLD; @@ -395,11 +429,15 @@ static int old_init_ucred_reint(struct mdt_thread_info *info) if (!is_identity_get_disabled(mdt->mdt_identity_cache)) { identity = mdt_identity_get(mdt->mdt_identity_cache, uc->mu_fsuid); - if (!identity) { - CERROR("Deny access without identity: uid %d\n", - uc->mu_fsuid); - RETURN(-EACCES); - } + if (IS_ERR(identity)) { + if (unlikely(PTR_ERR(identity) == -EREMCHG)) { + identity = NULL; + } else { + CDEBUG(D_SEC, "Deny access without identity: " + "uid %u\n", uc->mu_fsuid); + RETURN(-EACCES); + } + } } uc->mu_identity = identity; @@ -408,7 +446,7 @@ static int old_init_ucred_reint(struct mdt_thread_info *info) /* remove fs privilege for non-root user */ if (uc->mu_fsuid) - uc->mu_cap &= ~CAP_FS_MASK; + uc->mu_cap &= ~CFS_CAP_FS_MASK; uc->mu_valid = UCRED_OLD; RETURN(0); @@ -471,9 +509,10 @@ void mdt_dump_lmm(int level, const struct lov_mds_md *lmm) void mdt_shrink_reply(struct mdt_thread_info *info) { - struct req_capsule *pill = &info->mti_pill; - struct mdt_body *body; - int acl_size, md_size, adjust = 0; + struct req_capsule *pill = info->mti_pill; + struct mdt_body *body; + int md_size; + int acl_size; ENTRY; body = req_capsule_server_get(pill, &RMF_MDT_BODY); @@ -486,11 +525,11 @@ void mdt_shrink_reply(struct mdt_thread_info *info) acl_size = body->aclsize; - CDEBUG(D_INFO, "Shrink to md_size = %d cookie/acl_size = %d" - " MDSCAPA = %d, OSSCAPA = %d\n", + CDEBUG(D_INFO, "Shrink to md_size = %d cookie/acl_size = %d" + " MDSCAPA = "LPX64", OSSCAPA = "LPX64"\n", md_size, acl_size, - (int)(body->valid & OBD_MD_FLMDSCAPA), - (int)(body->valid & OBD_MD_FLOSSCAPA)); + body->valid & OBD_MD_FLMDSCAPA, + body->valid & OBD_MD_FLOSSCAPA); /* &RMF_MDT_BODY, &RMF_MDT_MD, @@ -499,33 +538,23 @@ void mdt_shrink_reply(struct mdt_thread_info *info) (optional) &RMF_CAPA2, (optional) something else */ - adjust += req_capsule_shrink(pill, &RMF_MDT_MD, - md_size, adjust, 1); + if (req_capsule_has_field(pill, &RMF_MDT_MD, RCL_SERVER)) + req_capsule_shrink(pill, &RMF_MDT_MD, md_size, + RCL_SERVER); if (req_capsule_has_field(pill, &RMF_ACL, RCL_SERVER)) - adjust += req_capsule_shrink(pill, &RMF_ACL, - acl_size, adjust, 1); + req_capsule_shrink(pill, &RMF_ACL, acl_size, RCL_SERVER); else if (req_capsule_has_field(pill, &RMF_LOGCOOKIES, RCL_SERVER)) - adjust += req_capsule_shrink(pill, &RMF_LOGCOOKIES, - acl_size, adjust, 1); - - /* RMF_CAPA1 on server-side maybe for OBD_MD_FLMDSCAPA or - * OBD_MD_FLOSSCAPA. If RMF_CAPA2 exist also, RMF_CAPA1 is - * for OBD_MD_FLMDSCAPA only. */ - if (req_capsule_has_field(pill, &RMF_CAPA1, RCL_SERVER)) { - if ((req_capsule_has_field(pill, &RMF_CAPA2, RCL_SERVER) && - !(body->valid & OBD_MD_FLMDSCAPA)) || - (!req_capsule_has_field(pill, &RMF_CAPA2, RCL_SERVER) && - !(body->valid & OBD_MD_FLMDSCAPA) && - !(body->valid & OBD_MD_FLOSSCAPA))) - adjust += req_capsule_shrink(pill, &RMF_CAPA1, - 0, adjust, 1); - } + req_capsule_shrink(pill, &RMF_LOGCOOKIES, + acl_size, RCL_SERVER); + + if (req_capsule_has_field(pill, &RMF_CAPA1, RCL_SERVER) && + !(body->valid & OBD_MD_FLMDSCAPA)) + req_capsule_shrink(pill, &RMF_CAPA1, 0, RCL_SERVER); - /* RMF_CAPA2 on server-side is for OBD_MD_FLOSSCAPA only. */ - if ((req_capsule_has_field(pill, &RMF_CAPA2, RCL_SERVER) && - !(body->valid & OBD_MD_FLOSSCAPA))) - adjust += req_capsule_shrink(pill, &RMF_CAPA2, 0, adjust, 0); + if (req_capsule_has_field(pill, &RMF_CAPA2, RCL_SERVER) && + !(body->valid & OBD_MD_FLOSSCAPA)) + req_capsule_shrink(pill, &RMF_CAPA2, 0, RCL_SERVER); /* * Some more field should be shrinked if needed. @@ -544,7 +573,7 @@ int mdt_handle_last_unlink(struct mdt_thread_info *info, struct mdt_object *mo, const struct lu_attr *la = &ma->ma_attr; ENTRY; - 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); if (ma->ma_valid & MA_INODE) @@ -652,7 +681,10 @@ static __u64 mdt_attr_valid_xlate(__u64 in, struct mdt_reint_record *rr, out |= LA_FLAGS; if (in & MDS_OPEN_OWNEROVERRIDE) - out |= MDS_OPEN_OWNEROVERRIDE; + ma->ma_attr_flags |= MDS_OPEN_OWNEROVERRIDE; + + if (in & (ATTR_KILL_SUID|ATTR_KILL_SGID)) + ma->ma_attr_flags |= MDS_PERM_BYPASS; /*XXX need ATTR_RAW?*/ in &= ~(ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_BLOCKS| @@ -670,12 +702,13 @@ static int mdt_setattr_unpack_rec(struct mdt_thread_info *info) struct md_ucred *uc = mdt_ucred(info); struct md_attr *ma = &info->mti_attr; struct lu_attr *la = &ma->ma_attr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; struct mdt_reint_record *rr = &info->mti_rr; struct mdt_rec_setattr *rec; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_SETATTR); + CLASSERT(sizeof(struct mdt_rec_setattr)== sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); @@ -707,7 +740,7 @@ static int mdt_setattr_unpack_rec(struct mdt_thread_info *info) static int mdt_epoch_unpack(struct mdt_thread_info *info) { - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; ENTRY; if (req_capsule_get_size(pill, &RMF_MDT_EPOCH, RCL_CLIENT)) @@ -718,21 +751,21 @@ static int mdt_epoch_unpack(struct mdt_thread_info *info) } static inline int mdt_dlmreq_unpack(struct mdt_thread_info *info) { - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; if (req_capsule_get_size(pill, &RMF_DLM_REQ, RCL_CLIENT)) { info->mti_dlm_req = req_capsule_client_get(pill, &RMF_DLM_REQ); if (info->mti_dlm_req == NULL) RETURN(-EFAULT); } - + RETURN(0); } static int mdt_setattr_unpack(struct mdt_thread_info *info) { struct md_attr *ma = &info->mti_attr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; int rc; ENTRY; @@ -778,12 +811,13 @@ static int mdt_create_unpack(struct mdt_thread_info *info) struct mdt_rec_create *rec; struct lu_attr *attr = &info->mti_attr.ma_attr; struct mdt_reint_record *rr = &info->mti_rr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; struct md_op_spec *sp = &info->mti_spec; int rc; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_CREATE); + CLASSERT(sizeof(struct mdt_rec_create) == sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); @@ -816,8 +850,8 @@ static int mdt_create_unpack(struct mdt_thread_info *info) rr->rr_name = req_capsule_client_get(pill, &RMF_NAME); rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1; - LASSERT(rr->rr_namelen > 0); - + LASSERT(rr->rr_name && rr->rr_namelen > 0); + #ifdef CONFIG_FS_POSIX_ACL if (sp->sp_cr_flags & MDS_CREATE_RMT_ACL) { if (S_ISDIR(attr->la_mode)) @@ -827,7 +861,7 @@ static int mdt_create_unpack(struct mdt_thread_info *info) RCL_CLIENT)); sp->u.sp_ea.eadata = req_capsule_client_get(pill, &RMF_EADATA); sp->u.sp_ea.eadatalen = req_capsule_get_size(pill, &RMF_EADATA, - RCL_CLIENT); + RCL_CLIENT); sp->u.sp_ea.fid = rr->rr_fid1; RETURN(0); } @@ -874,11 +908,12 @@ static int mdt_link_unpack(struct mdt_thread_info *info) struct mdt_rec_link *rec; struct lu_attr *attr = &info->mti_attr.ma_attr; struct mdt_reint_record *rr = &info->mti_rr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; int rc; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_LINK); + CLASSERT(sizeof(struct mdt_rec_link) == sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); @@ -922,18 +957,19 @@ static int mdt_unlink_unpack(struct mdt_thread_info *info) struct md_attr *ma = &info->mti_attr; struct lu_attr *attr = &info->mti_attr.ma_attr; struct mdt_reint_record *rr = &info->mti_rr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; int rc; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_UNLINK); + CLASSERT(sizeof(struct mdt_rec_unlink) == sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); uc->mu_fsuid = rec->ul_fsuid; uc->mu_fsgid = rec->ul_fsgid; uc->mu_cap = rec->ul_cap; - uc->mu_suppgids[0] = rec->ul_suppgid; + uc->mu_suppgids[0] = rec->ul_suppgid1; uc->mu_suppgids[1] = -1; attr->la_uid = rec->ul_fsuid; @@ -972,11 +1008,12 @@ static int mdt_rename_unpack(struct mdt_thread_info *info) struct md_attr *ma = &info->mti_attr; struct lu_attr *attr = &info->mti_attr.ma_attr; struct mdt_reint_record *rr = &info->mti_rr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; int rc; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_RENAME); + CLASSERT(sizeof(struct mdt_rec_rename) == sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); @@ -1027,13 +1064,14 @@ static int mdt_open_unpack(struct mdt_thread_info *info) struct md_ucred *uc = mdt_ucred(info); struct mdt_rec_create *rec; struct lu_attr *attr = &info->mti_attr.ma_attr; - struct req_capsule *pill = &info->mti_pill; + struct req_capsule *pill = info->mti_pill; struct mdt_reint_record *rr = &info->mti_rr; struct ptlrpc_request *req = mdt_info_req(info); struct md_op_spec *sp = &info->mti_spec; ENTRY; - rec = req_capsule_client_get(pill, &RMF_REC_CREATE); + CLASSERT(sizeof(struct mdt_rec_create) == sizeof(struct mdt_rec_reint)); + rec = req_capsule_client_get(pill, &RMF_REC_REINT); if (rec == NULL) RETURN(-EFAULT); @@ -1096,6 +1134,59 @@ static int mdt_open_unpack(struct mdt_thread_info *info) RETURN(0); } +static int mdt_setxattr_unpack(struct mdt_thread_info *info) +{ + struct mdt_reint_record *rr = &info->mti_rr; + struct md_ucred *uc = mdt_ucred(info); + struct lu_attr *attr = &info->mti_attr.ma_attr; + struct req_capsule *pill = info->mti_pill; + struct mdt_rec_setxattr *rec; + ENTRY; + + + CLASSERT(sizeof(struct mdt_rec_setxattr) == + sizeof(struct mdt_rec_reint)); + + rec = req_capsule_client_get(pill, &RMF_REC_REINT); + if (rec == NULL) + RETURN(-EFAULT); + + uc->mu_fsuid = rec->sx_fsuid; + uc->mu_fsgid = rec->sx_fsgid; + uc->mu_cap = rec->sx_cap; + uc->mu_suppgids[0] = rec->sx_suppgid1; + uc->mu_suppgids[1] = -1; + + rr->rr_opcode = rec->sx_opcode; + rr->rr_fid1 = &rec->sx_fid; + attr->la_valid = rec->sx_valid; + attr->la_ctime = rec->sx_time; + attr->la_size = rec->sx_size; + attr->la_flags = rec->sx_flags; + + if (req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT)) + mdt_set_capainfo(info, 0, rr->rr_fid1, + req_capsule_client_get(pill, &RMF_CAPA1)); + else + mdt_set_capainfo(info, 0, rr->rr_fid1, BYPASS_CAPA); + + rr->rr_name = req_capsule_client_get(pill, &RMF_NAME); + if (rr->rr_name == NULL) + RETURN(-EFAULT); + rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1; + LASSERT(rr->rr_namelen > 0); + + rr->rr_eadatalen = req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT); + if (rr->rr_eadatalen > 0) { + rr->rr_eadata = req_capsule_client_get(pill, &RMF_EADATA); + if (rr->rr_eadata == NULL) + RETURN(-EFAULT); + } + + RETURN(0); +} + + typedef int (*reint_unpacker)(struct mdt_thread_info *info); static reint_unpacker mdt_reint_unpackers[REINT_MAX] = { @@ -1104,7 +1195,8 @@ static reint_unpacker mdt_reint_unpackers[REINT_MAX] = { [REINT_LINK] = mdt_link_unpack, [REINT_UNLINK] = mdt_unlink_unpack, [REINT_RENAME] = mdt_rename_unpack, - [REINT_OPEN] = mdt_open_unpack + [REINT_OPEN] = mdt_open_unpack, + [REINT_SETXATTR] = mdt_setxattr_unpack }; int mdt_reint_unpack(struct mdt_thread_info *info, __u32 op)