X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_reint.c;h=667946420f3dd0667547321c1486126c5c341b15;hb=7c4035f317111463f62b708f073cee8ef01e52dd;hp=ba4e3b96c570861afd66d0c0e234dc6204cf237a;hpb=45d054e77353bf5b09637923e5abeb3e72a997fd;p=fs%2Flustre-release.git diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index ba4e3b9..6679464 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -34,11 +34,13 @@ #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) +/* this function actually sends request to desired target. */ +static int mdc_reint(struct ptlrpc_request *request, + struct mdc_rpc_lock *rpc_lock, + int level) { int rc; @@ -60,37 +62,43 @@ 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. + +/* 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. */ + * 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, + struct iattr *iattr, void *ea, int ealen, void *ea2, + int ea2len, void *ea3, int ea3len, struct ptlrpc_request **request) { struct ptlrpc_request *req; 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] = lustre_secdesc_size(); if (ealen > 0) { - bufcount = 2; + bufcount++; if (ea2len > 0) - bufcount = 3; + bufcount++; + if (ea3len > 0) + 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); + lustre_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; @@ -101,10 +109,23 @@ 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->rq_reqmsg, data, iattr, ea, ealen, ea2, ea2len); + mdc_setattr_pack(req->rq_reqmsg, 1, data, iattr, ea, ealen, + ea2, ea2len, ea3, ea3len); + /* prepare the reply buffer + */ + bufcount = 1; size[0] = sizeof(struct mds_body); - req->rq_replen = lustre_msg_size(1, size); + + /* This is a hack for setfacl remotely. XXX */ + if (ealen == sizeof(XATTR_NAME_LUSTRE_ACL) && + !strncmp((char *) ea, XATTR_NAME_LUSTRE_ACL, ealen)) { + size[bufcount++] = LUSTRE_ACL_SIZE_MAX; + } else if (iattr->ia_valid & ATTR_SIZE) { + size[bufcount++] = sizeof(struct lustre_capa); + } + + req->rq_replen = lustre_msg_size(bufcount, size); rc = mdc_reint(req, rpc_lock, LUSTRE_IMP_FULL); *request = req; @@ -115,28 +136,34 @@ int mdc_setattr(struct obd_export *exp, struct mdc_op_data *data, } int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, - const void *data, int datalen, int mode, __u32 uid, __u32 gid, - __u64 rdev, struct ptlrpc_request **request) + const void *data, int datalen, int mode, __u32 uid, + __u32 gid, __u64 rdev, struct ptlrpc_request **request) { 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] = lustre_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_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, 0, op_data, mode, rdev, data, datalen); + lustre_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); size[0] = sizeof(struct mds_body); req->rq_replen = lustre_msg_size(1, size); @@ -144,14 +171,15 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, level = LUSTRE_IMP_FULL; resend: rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, level); - /* Resend if we were told to. */ + + /* resend if we were told to. */ if (rc == -ERESTARTSYS) { level = LUSTRE_IMP_RECOVER; goto resend; } if (!rc) - mdc_store_inode_generation(exp, req, 0, 0); + mdc_store_inode_generation(exp, req, MDS_REQ_REC_OFF, 0); *request = req; RETURN(rc); @@ -160,28 +188,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[3] = {sizeof(struct mds_rec_unlink), + int rc, size[4] = {0, sizeof(struct mds_rec_unlink), data->namelen + 1, - obddev->u.cli.cl_max_mds_cookiesize}; + obd->u.cli.cl_max_mds_cookiesize}; ENTRY; - LASSERT(req == NULL); - req = ptlrpc_prep_req(class_exp2cliimp(exp), MDS_REINT, 3, size, - NULL); + + size[0] = lustre_secdesc_size(); + + req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_MDS_VERSION, + MDS_REINT, 4, size, NULL); if (req == NULL) RETURN(-ENOMEM); + + lustre_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->rq_reqmsg, 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); @@ -192,15 +225,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] = lustre_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->rq_reqmsg, 0, data); + lustre_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); @@ -219,16 +256,20 @@ 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[4] = {sizeof(struct mds_rec_rename), oldlen + 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, 4, size, - NULL); + size[0] = lustre_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->rq_reqmsg, 0, data, old, oldlen, new, newlen); + lustre_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;