X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_reint.c;h=63bbb0c7863b985f43d4d823778991839569b558;hp=0515372222cc3cfc53e4178af83e44481079c214;hb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;hpb=7bb892f4f3de837a940d867b97fe14013ad67dc6 diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index 0515372..63bbb0c 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -3,20 +3,23 @@ * * Copyright (C) 2001-2003 Cluster File Systems, Inc. * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free 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. + * 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. * - * 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 - * GNU General Public License for more details. + * 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. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ #ifndef EXPORT_SYMTAB @@ -25,62 +28,67 @@ #define DEBUG_SUBSYSTEM S_MDC #ifdef __KERNEL__ +#ifdef HAVE_KERNEL_CONFIG_H # include +#endif # include # include #else # include #endif -#include -#include +#include #include "mdc_internal.h" /* mdc_setattr does its own semaphore handling */ -int mdc_reint(struct ptlrpc_request *request, - struct mdc_rpc_lock *rpc_lock, int level) +static int mdc_reint(struct ptlrpc_request *request, + struct mdc_rpc_lock *rpc_lock, int level) { int rc; request->rq_send_state = level; - - if (rpc_lock) - mdc_get_rpc_lock(rpc_lock, NULL); - + + mdc_get_rpc_lock(rpc_lock, NULL); rc = ptlrpc_queue_wait(request); - - if (rpc_lock) - mdc_put_rpc_lock(rpc_lock, NULL); + mdc_put_rpc_lock(rpc_lock, NULL); if (rc) CDEBUG(D_INFO, "error in handling %d\n", rc); - else if (!lustre_swab_repbuf(request, 0, sizeof(struct mds_body), - lustre_swab_mds_body)) { - CERROR ("Can't unpack mds_body\n"); + else if (!lustre_swab_repbuf(request, REPLY_REC_OFF, + sizeof(struct mdt_body), + lustre_swab_mdt_body)) { + CERROR ("Can't unpack mdt_body\n"); rc = -EPROTO; } return rc; } -EXPORT_SYMBOL(mdc_reint); + /* If mdc_setattr is called with an 'iattr', then it is a normal RPC that * should take the normal semaphore and go to the normal portal. * * If it is called with iattr->ia_valid & ATTR_FROM_OPEN, then it is a * magic open-path setattr that should take the setattr semaphore and * go to the setattr portal. */ -int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, - struct iattr *iattr, void *ea, int ealen, void *ea2, int ea2len, +int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, + void *ea, int ealen, void *ea2, int ea2len, struct ptlrpc_request **request) { struct ptlrpc_request *req; - struct mds_rec_setattr *rec; + struct mdt_rec_setattr *rec; struct mdc_rpc_lock *rpc_lock; struct obd_device *obd = exp->exp_obd; - int rc, bufcount = 2, size[4] = {0, sizeof(*rec), ealen, ea2len}; + int size[6] = { sizeof(struct ptlrpc_body), + sizeof(*rec), 0, 0, ealen, ea2len }; + int bufcount = 4, rc; ENTRY; - LASSERT(iattr != NULL); + LASSERT(op_data != NULL); + + size[REQ_REC_OFF + 1] = op_data->op_capa1 ? + sizeof(struct lustre_capa) : 0; + + if (op_data->op_flags & (MF_SOM_CHANGE | MF_EPOCH_OPEN)) + size[REQ_REC_OFF + 2] = sizeof(struct mdt_epoch); - size[0] = mdc_get_secdesc_size(); if (ealen > 0) { bufcount++; if (ea2len > 0) @@ -92,23 +100,22 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, if (req == NULL) RETURN(-ENOMEM); - mdc_pack_secdesc(req, size[0]); - - if (iattr->ia_valid & ATTR_FROM_OPEN) { + if (op_data->op_attr.ia_valid & ATTR_FROM_OPEN) { req->rq_request_portal = MDS_SETATTR_PORTAL; //XXX FIXME bug 249 rpc_lock = obd->u.cli.cl_setattr_lock; } else { rpc_lock = obd->u.cli.cl_rpc_lock; } - if (iattr->ia_valid & (ATTR_MTIME | ATTR_CTIME)) + if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME)) CDEBUG(D_INODE, "setting mtime %lu, ctime %lu\n", - LTIME_S(iattr->ia_mtime), LTIME_S(iattr->ia_ctime)); - mdc_setattr_pack(req->rq_reqmsg, 1, data, iattr, ea, ealen, - ea2, ea2len); + LTIME_S(op_data->op_attr.ia_mtime), + LTIME_S(op_data->op_attr.ia_ctime)); + mdc_setattr_pack(req, REQ_REC_OFF, op_data, ea, ealen, ea2, ea2len); - size[0] = sizeof(struct mds_body); - req->rq_replen = lustre_msg_size(1, size); + size[REPLY_REC_OFF] = sizeof(struct mdt_body); + size[REPLY_REC_OFF + 1] = sizeof(struct lustre_capa); + ptlrpc_req_set_repsize(req, 3, size); rc = mdc_reint(req, rpc_lock, LUSTRE_IMP_FULL); *request = req; @@ -118,18 +125,34 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, RETURN(rc); } -int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, +int mdc_create(struct obd_export *exp, struct md_op_data *op_data, const void *data, int datalen, int mode, __u32 uid, __u32 gid, - __u64 rdev, struct ptlrpc_request **request) + __u32 cap_effective, __u64 rdev, struct ptlrpc_request **request) { + int size[5] = { sizeof(struct ptlrpc_body), + sizeof(struct mdt_rec_create), + 0, op_data->op_namelen + 1 }; struct obd_device *obd = exp->exp_obd; + int level, bufcount = 4, rc; struct ptlrpc_request *req; - int rc, size[4] = {0, sizeof(struct mds_rec_create), - op_data->namelen + 1}; - int level, bufcount = 3; ENTRY; - size[0] = mdc_get_secdesc_size(); + /* For case if upper layer did not alloc fid, do it now. */ + if (!fid_is_sane(&op_data->op_fid2)) { + /* + * mdc_fid_alloc() may return errno 1 in case of switch to new + * sequence, handle this. + */ + rc = mdc_fid_alloc(exp, &op_data->op_fid2, op_data); + if (rc < 0) { + CERROR("Can't alloc new fid, rc %d\n", rc); + RETURN(rc); + } + } + + size[REQ_REC_OFF + 1] = op_data->op_capa1 ? + sizeof(struct lustre_capa) : 0; + if (data && datalen) { size[bufcount] = datalen; bufcount++; @@ -140,86 +163,106 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, if (req == NULL) RETURN(-ENOMEM); - mdc_pack_secdesc(req, size[0]); - - /* mdc_create_pack fills msg->bufs[1] with name - * and msg->bufs[2] with tgt, for symlinks or lov MD data */ - mdc_create_pack(req->rq_reqmsg, 1, op_data, mode, rdev, data, datalen); + /* + * mdc_create_pack() fills msg->bufs[1] with name and msg->bufs[2] with + * tgt, for symlinks or lov MD data. + */ + mdc_create_pack(req, REQ_REC_OFF, op_data, data, datalen, mode, uid, + gid, cap_effective, rdev); - size[0] = sizeof(struct mds_body); - req->rq_replen = lustre_msg_size(1, size); + size[REPLY_REC_OFF] = sizeof(struct mdt_body); + size[REPLY_REC_OFF + 1] = sizeof(struct lustre_capa); + ptlrpc_req_set_repsize(req, 3, size); level = LUSTRE_IMP_FULL; resend: rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, level); + /* Resend if we were told to. */ if (rc == -ERESTARTSYS) { level = LUSTRE_IMP_RECOVER; goto resend; + } else if (rc == 0) { + struct mdt_body *body; + struct lustre_capa *capa; + + body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, + sizeof(*body)); + LASSERT(body); + if (body->valid & OBD_MD_FLMDSCAPA) { + capa = lustre_unpack_capa(req->rq_repmsg, + REPLY_REC_OFF + 1); + if (capa == NULL) { + CERROR("Missing/short MDS capability\n"); + rc = -EPROTO; + } + } } - if (!rc) - mdc_store_inode_generation(exp, req, MDS_REQ_REC_OFF, 0); - *request = req; RETURN(rc); } -int mdc_unlink(struct obd_export *exp, struct mdc_op_data *data, +int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data, struct ptlrpc_request **request) { - struct obd_device *obddev = class_exp2obd(exp); + struct obd_device *obd = class_exp2obd(exp); struct ptlrpc_request *req = *request; - int rc, size[4] = {0, sizeof(struct mds_rec_unlink), - data->namelen + 1, - obddev->u.cli.cl_max_mds_cookiesize}; + int size[4] = { sizeof(struct ptlrpc_body), + sizeof(struct mdt_rec_unlink), + 0, op_data->op_namelen + 1 }; + int rc; ENTRY; + LASSERT(req == NULL); - size[0] = mdc_get_secdesc_size(); + size[REQ_REC_OFF + 1] = op_data->op_capa1 ? + sizeof(struct lustre_capa) : 0; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, MDS_REINT, 4, size, NULL); if (req == NULL) RETURN(-ENOMEM); - - mdc_pack_secdesc(req, size[0]); *request = req; - size[0] = sizeof(struct mds_body); - size[1] = obddev->u.cli.cl_max_mds_easize; - size[2] = obddev->u.cli.cl_max_mds_cookiesize; - req->rq_replen = lustre_msg_size(3, size); + size[REPLY_REC_OFF] = sizeof(struct mdt_body); + size[REPLY_REC_OFF + 1] = obd->u.cli.cl_max_mds_easize; + size[REPLY_REC_OFF + 2] = obd->u.cli.cl_max_mds_cookiesize; + ptlrpc_req_set_repsize(req, 4, size); - mdc_unlink_pack(req->rq_reqmsg, 1, data); + mdc_unlink_pack(req, REQ_REC_OFF, op_data); - rc = mdc_reint(req, obddev->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL); + rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL); if (rc == -ERESTARTSYS) rc = 0; RETURN(rc); } -int mdc_link(struct obd_export *exp, struct mdc_op_data *data, +int mdc_link(struct obd_export *exp, struct md_op_data *op_data, struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct ptlrpc_request *req; - int rc, size[3] = {0, sizeof(struct mds_rec_link), data->namelen + 1}; + int size[5] = { sizeof(struct ptlrpc_body), + sizeof(struct mdt_rec_link), + 0, 0, op_data->op_namelen + 1 }; + int rc; ENTRY; - size[0] = mdc_get_secdesc_size(); + size[REQ_REC_OFF + 1] = op_data->op_capa1 ? + sizeof(struct lustre_capa) : 0; + size[REQ_REC_OFF + 2] = op_data->op_capa2 ? + sizeof(struct lustre_capa) : 0; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, - MDS_REINT, 3, size, NULL); + MDS_REINT, 5, size, NULL); if (req == NULL) RETURN(-ENOMEM); - mdc_pack_secdesc(req, size[0]); - - mdc_link_pack(req->rq_reqmsg, 1, data); + mdc_link_pack(req, REQ_REC_OFF, op_data); - size[0] = sizeof(struct mds_body); - req->rq_replen = lustre_msg_size(1, size); + size[REPLY_REC_OFF] = sizeof(struct mdt_body); + ptlrpc_req_set_repsize(req, 2, size); rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL); *request = req; @@ -229,31 +272,34 @@ int mdc_link(struct obd_export *exp, struct mdc_op_data *data, RETURN(rc); } -int mdc_rename(struct obd_export *exp, struct mdc_op_data *data, +int mdc_rename(struct obd_export *exp, struct md_op_data *op_data, const char *old, int oldlen, const char *new, int newlen, struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct ptlrpc_request *req; - int rc, size[5] = {0, sizeof(struct mds_rec_rename), oldlen + 1, - newlen + 1, obd->u.cli.cl_max_mds_cookiesize}; + int size[6] = { sizeof(struct ptlrpc_body), + sizeof(struct mdt_rec_rename), + 0, 0, oldlen + 1, newlen + 1 }; + int rc; ENTRY; - size[0] = mdc_get_secdesc_size(); + size[REQ_REC_OFF + 1] = op_data->op_capa1 ? + sizeof(struct lustre_capa) : 0; + size[REQ_REC_OFF + 2] = op_data->op_capa2 ? + sizeof(struct lustre_capa) : 0; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, - MDS_REINT, 5, size, NULL); + MDS_REINT, 6, size, NULL); if (req == NULL) RETURN(-ENOMEM); - mdc_pack_secdesc(req, size[0]); - - mdc_rename_pack(req->rq_reqmsg, 1, data, old, oldlen, new, newlen); + mdc_rename_pack(req, REQ_REC_OFF, op_data, old, oldlen, new, newlen); - size[0] = sizeof(struct mds_body); - size[1] = obd->u.cli.cl_max_mds_easize; - size[2] = obd->u.cli.cl_max_mds_cookiesize; - req->rq_replen = lustre_msg_size(3, size); + size[REPLY_REC_OFF] = sizeof(struct mdt_body); + size[REPLY_REC_OFF + 1] = obd->u.cli.cl_max_mds_easize; + size[REPLY_REC_OFF + 2] = obd->u.cli.cl_max_mds_cookiesize; + ptlrpc_req_set_repsize(req, 4, size); rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL); *request = req;