X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_reint.c;h=b34e1e1893e73a5a4ba33ce5a70fae839c6ce79c;hb=c39489126f88bb5b30643ebb11c72fbe9f9d2241;hp=d09227029db1d6c815f2323acd6343d3104cb392;hpb=090c677210ee2946d99c71412e4ff762bb300f4f;p=fs%2Flustre-release.git diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index d092270..b34e1e1 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -37,17 +37,20 @@ #include "mdc_internal.h" /* mdc_setattr does its own semaphore handling */ -static int mdc_reint(struct ptlrpc_request *request, - struct mdc_rpc_lock *rpc_lock, int level) +int mdc_reint(struct ptlrpc_request *request, + struct mdc_rpc_lock *rpc_lock, int level) { int rc; - request->rq_send_state = level; - - mdc_get_rpc_lock(rpc_lock, NULL); + + if (rpc_lock) + mdc_get_rpc_lock(rpc_lock, NULL); + rc = ptlrpc_queue_wait(request); - mdc_put_rpc_lock(rpc_lock, NULL); + + if (rpc_lock) + 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), @@ -57,7 +60,7 @@ static int mdc_reint(struct ptlrpc_request *request, } 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. * @@ -72,22 +75,25 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, struct mds_rec_setattr *rec; struct mdc_rpc_lock *rpc_lock; struct obd_device *obd = exp->exp_obd; - int rc, bufcount = 1, size[3] = {sizeof(*rec), ealen, ea2len}; + int rc, bufcount = 2, size[4] = {0, sizeof(*rec), ealen, ea2len}; ENTRY; LASSERT(iattr != NULL); + size[0] = mdc_get_secdesc_size(); if (ealen > 0) { - bufcount = 2; + bufcount++; if (ea2len > 0) - bufcount = 3; + bufcount++; } - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, bufcount, - size, NULL); + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, + MDS_REINT, bufcount, size, NULL); if (req == NULL) RETURN(-ENOMEM); + mdc_pack_secdesc(req, size[0]); + if (iattr->ia_valid & ATTR_FROM_OPEN) { req->rq_request_portal = MDS_SETATTR_PORTAL; //XXX FIXME bug 249 rpc_lock = obd->u.cli.cl_setattr_lock; @@ -98,7 +104,8 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, if (iattr->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, data, iattr, ea, ealen, ea2, ea2len); + mdc_setattr_pack(req->rq_reqmsg, 1, data, iattr, ea, ealen, + ea2, ea2len); size[0] = sizeof(struct mds_body); req->rq_replen = lustre_msg_size(1, size); @@ -117,23 +124,27 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, { struct obd_device *obd = exp->exp_obd; struct ptlrpc_request *req; - int rc, size[3] = {sizeof(struct mds_rec_create), op_data->namelen + 1}; - int level, bufcount = 2; + 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(); if (data && datalen) { size[bufcount] = datalen; bufcount++; } - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, bufcount, - size, NULL); + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, + MDS_REINT, bufcount, size, NULL); 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, 0, op_data, mode, rdev, data, datalen); + mdc_create_pack(req->rq_reqmsg, 1, op_data, mode, rdev, data, datalen); size[0] = sizeof(struct mds_body); req->rq_replen = lustre_msg_size(1, size); @@ -148,7 +159,7 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, } if (!rc) - mdc_store_inode_generation(req, 0, 0); + mdc_store_inode_generation(exp, req, MDS_REQ_REC_OFF, 0); *request = req; RETURN(rc); @@ -157,26 +168,33 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, int mdc_unlink(struct obd_export *exp, struct mdc_op_data *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[2] = {sizeof(struct mds_rec_unlink), data->namelen + 1}; + int rc, size[4] = {0, sizeof(struct mds_rec_unlink), + data->namelen + 1, + obd->u.cli.cl_max_mds_cookiesize}; ENTRY; - LASSERT(req == NULL); - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, 2, size, - NULL); + + size[0] = mdc_get_secdesc_size(); + + 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; + 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); - mdc_unlink_pack(req, 0, data); + mdc_unlink_pack(req->rq_reqmsg, 1, 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); @@ -187,15 +205,19 @@ int mdc_link(struct obd_export *exp, struct mdc_op_data *data, { struct obd_device *obd = exp->exp_obd; struct ptlrpc_request *req; - int rc, size[2] = {sizeof(struct mds_rec_link), data->namelen + 1}; + int rc, size[3] = {0, sizeof(struct mds_rec_link), data->namelen + 1}; ENTRY; - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, 2, size, - NULL); + size[0] = mdc_get_secdesc_size(); + + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, + MDS_REINT, 3, size, NULL); if (req == NULL) RETURN(-ENOMEM); - mdc_link_pack(req, 0, data); + mdc_pack_secdesc(req, size[0]); + + mdc_link_pack(req->rq_reqmsg, 1, data); size[0] = sizeof(struct mds_body); req->rq_replen = lustre_msg_size(1, size); @@ -214,20 +236,25 @@ int mdc_rename(struct obd_export *exp, struct mdc_op_data *data, { struct obd_device *obd = exp->exp_obd; struct ptlrpc_request *req; - int rc, size[3] = {sizeof(struct mds_rec_rename), oldlen + 1, - newlen + 1}; + int rc, size[5] = {0, sizeof(struct mds_rec_rename), oldlen + 1, + newlen + 1, obd->u.cli.cl_max_mds_cookiesize}; ENTRY; - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, 3, size, - NULL); + size[0] = mdc_get_secdesc_size(); + + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, + MDS_REINT, 5, size, NULL); if (req == NULL) RETURN(-ENOMEM); - mdc_rename_pack(req, 0, data, old, oldlen, new, newlen); + mdc_pack_secdesc(req, size[0]); + + mdc_rename_pack(req->rq_reqmsg, 1, data, old, oldlen, new, newlen); size[0] = sizeof(struct mds_body); size[1] = obd->u.cli.cl_max_mds_easize; - req->rq_replen = lustre_msg_size(2, size); + size[2] = obd->u.cli.cl_max_mds_cookiesize; + req->rq_replen = lustre_msg_size(3, size); rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL); *request = req;