X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_request.c;h=2a5b2c7537def5f378f13c15cf041963960c7406;hb=3e76334402a71e37aed4e9a5166d0141e30af375;hp=102e24f5f4d17077efaec078644315cd17a596bd;hpb=acd639bf0de0c39419dff94fd6d338283a1ddb24;p=fs%2Flustre-release.git diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index 102e24f..2a5b2c7 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -39,9 +39,9 @@ #include #include #include -#ifdef HAVE_UIDGID_HEADER -# include -#endif +#include +#include +#include #include @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -240,8 +241,9 @@ again: rc = mdc_getattr_common(exp, req); if (rc) { if (rc == -ERANGE) { - acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize, - XATTR_SIZE_MAX); + acl_bufsize = min_t(__u32, + imp->imp_connect_data.ocd_max_easize, + XATTR_SIZE_MAX); mdc_reset_acl_req(req); goto again; } @@ -295,8 +297,9 @@ again: rc = mdc_getattr_common(exp, req); if (rc) { if (rc == -ERANGE) { - acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize, - XATTR_SIZE_MAX); + acl_bufsize = min_t(__u32, + imp->imp_connect_data.ocd_max_easize, + XATTR_SIZE_MAX); mdc_reset_acl_req(req); goto again; } @@ -452,7 +455,9 @@ static int mdc_getxattr(struct obd_export *exp, const struct lu_fid *fid, LASSERT(obd_md_valid == OBD_MD_FLXATTR || obd_md_valid == OBD_MD_FLXATTRLS); - /* The below message is checked in sanity-selinux.sh test_20d */ + /* Message below is checked in sanity-selinux test_20d + * and sanity-sec test_49 + */ CDEBUG(D_INFO, "%s: get xattr '%s' for "DFID"\n", exp->exp_obd->obd_name, name, PFID(fid)); rc = mdc_xattr_common(exp, &RQF_MDS_GETXATTR, fid, MDS_GETXATTR, @@ -502,50 +507,10 @@ out: return rc; } -#ifdef CONFIG_LUSTRE_FS_POSIX_ACL -static int mdc_unpack_acl(struct ptlrpc_request *req, struct lustre_md *md) -{ - struct req_capsule *pill = &req->rq_pill; - struct mdt_body *body = md->body; - struct posix_acl *acl; - void *buf; - int rc; - ENTRY; - - if (!body->mbo_aclsize) - RETURN(0); - - buf = req_capsule_server_sized_get(pill, &RMF_ACL, body->mbo_aclsize); - - if (!buf) - RETURN(-EPROTO); - - acl = posix_acl_from_xattr(&init_user_ns, buf, body->mbo_aclsize); - if (acl == NULL) - RETURN(0); - if (IS_ERR(acl)) { - rc = PTR_ERR(acl); - CERROR("convert xattr to acl: %d\n", rc); - RETURN(rc); - } - - rc = posix_acl_valid(&init_user_ns, acl); - if (rc) { - CERROR("validate acl: %d\n", rc); - posix_acl_release(acl); - RETURN(rc); - } - - md->posix_acl = acl; - RETURN(0); -} -#else -#define mdc_unpack_acl(req, md) 0 -#endif - -int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req, - struct obd_export *dt_exp, struct obd_export *md_exp, - struct lustre_md *md) +static int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req, + struct obd_export *dt_exp, + struct obd_export *md_exp, + struct lustre_md *md) { struct req_capsule *pill = &req->rq_pill; int rc; @@ -640,38 +605,30 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req, } } } - rc = 0; + rc = 0; if (md->body->mbo_valid & OBD_MD_FLACL) { /* for ACL, it's possible that FLACL is set but aclsize is zero. * only when aclsize != 0 there's an actual segment for ACL * in reply buffer. */ - if (md->body->mbo_aclsize) { - rc = mdc_unpack_acl(req, md); - if (rc) - GOTO(out, rc); -#ifdef CONFIG_LUSTRE_FS_POSIX_ACL - } else { - md->posix_acl = NULL; -#endif - } - } + rc = mdc_unpack_acl(req, md); + if (rc) + GOTO(out, rc); + } - EXIT; + EXIT; out: - if (rc) { -#ifdef CONFIG_LUSTRE_FS_POSIX_ACL - posix_acl_release(md->posix_acl); -#endif - } - return rc; + if (rc) + lmd_clear_acl(md); + + return rc; } -int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md) +static int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md) { - ENTRY; - RETURN(0); + ENTRY; + RETURN(0); } void mdc_replay_open(struct ptlrpc_request *req) @@ -681,6 +638,7 @@ void mdc_replay_open(struct ptlrpc_request *req) struct obd_client_handle *och; struct lustre_handle old_open_handle = { }; struct mdt_body *body; + struct ldlm_reply *rep; ENTRY; if (mod == NULL) { @@ -693,6 +651,11 @@ void mdc_replay_open(struct ptlrpc_request *req) body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); LASSERT(body != NULL); + rep = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP); + if (rep != NULL && rep->lock_policy_res2 != 0) + DEBUG_REQ(D_ERROR, req, "Open request replay failed with %ld ", + (long int)rep->lock_policy_res2); + spin_lock(&req->rq_lock); och = mod->mod_och; if (och && och->och_open_handle.cookie) @@ -850,18 +813,18 @@ static void mdc_free_open(struct md_open_data *mod) ptlrpc_request_committed(mod->mod_close_req, committed); } -int mdc_clear_open_replay_data(struct obd_export *exp, - struct obd_client_handle *och) +static int mdc_clear_open_replay_data(struct obd_export *exp, + struct obd_client_handle *och) { - struct md_open_data *mod = och->och_mod; - ENTRY; + struct md_open_data *mod = och->och_mod; + ENTRY; - /** - * It is possible to not have \var mod in a case of eviction between - * lookup and ll_file_open(). - **/ - if (mod == NULL) - RETURN(0); + /** + * It is possible to not have \var mod in a case of eviction between + * lookup and ll_file_open(). + **/ + if (mod == NULL) + RETURN(0); LASSERT(mod != LP_POISON); LASSERT(mod->mod_open_req != NULL); @@ -873,11 +836,11 @@ int mdc_clear_open_replay_data(struct obd_export *exp, spin_unlock(&mod->mod_open_req->rq_lock); mdc_free_open(mod); - mod->mod_och = NULL; - och->och_mod = NULL; - obd_mod_put(mod); + mod->mod_och = NULL; + och->och_mod = NULL; + obd_mod_put(mod); - RETURN(0); + RETURN(0); } static int mdc_close(struct obd_export *exp, struct md_op_data *op_data, @@ -1057,7 +1020,7 @@ restart_bulk: ptlrpc_at_set_req_timeout(req); desc = ptlrpc_prep_bulk_imp(req, npages, 1, - PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KIOV, + PTLRPC_BULK_PUT_SINK, MDS_BULK_PORTAL, &ptlrpc_bulk_kiov_pin_ops); if (desc == NULL) { @@ -1085,7 +1048,12 @@ restart_bulk: exp->exp_obd->obd_name, -EIO); RETURN(-EIO); } - ssleep(resends); + + /* If a signal interrupts then the timeout returned will + * not be zero. In that case return -EINTR + */ + if (msleep_interruptible(resends * 1000)) + RETURN(-EINTR); goto restart_bulk; } @@ -1133,14 +1101,14 @@ static struct page *mdc_page_locate(struct address_space *mapping, __u64 *hash, unsigned long flags; int found; - xa_lock_irqsave(&mapping->i_pages, flags); + ll_xa_lock_irqsave(&mapping->i_pages, flags); found = radix_tree_gang_lookup(&mapping->page_tree, (void **)&page, offset, 1); - if (found > 0 && !radix_tree_exceptional_entry(page)) { + if (found > 0 && !ll_xa_is_value(page)) { struct lu_dirpage *dp; get_page(page); - xa_unlock_irqrestore(&mapping->i_pages, flags); + ll_xa_unlock_irqrestore(&mapping->i_pages, flags); /* * In contrast to find_lock_page() we are sure that directory * page cannot be truncated (while DLM lock is held) and, @@ -1189,7 +1157,7 @@ static struct page *mdc_page_locate(struct address_space *mapping, __u64 *hash, page = ERR_PTR(-EIO); } } else { - xa_unlock_irqrestore(&mapping->i_pages, flags); + ll_xa_unlock_irqrestore(&mapping->i_pages, flags); page = NULL; } return page; @@ -1339,7 +1307,7 @@ static int mdc_read_page_remote(void *data, struct page *page0) fid = &op_data->op_fid1; LASSERT(inode != NULL); - OBD_ALLOC(page_pool, sizeof(page_pool[0]) * max_pages); + OBD_ALLOC_PTR_ARRAY(page_pool, max_pages); if (page_pool != NULL) { page_pool[0] = page0; } else { @@ -1348,8 +1316,7 @@ static int mdc_read_page_remote(void *data, struct page *page0) } for (npages = 1; npages < max_pages; npages++) { - page = __page_cache_alloc(mapping_gfp_mask(inode->i_mapping) - | __GFP_COLD); + page = page_cache_alloc(inode->i_mapping); if (page == NULL) break; page_pool[npages] = page; @@ -1409,7 +1376,7 @@ static int mdc_read_page_remote(void *data, struct page *page0) } if (page_pool != &page0) - OBD_FREE(page_pool, sizeof(page_pool[0]) * max_pages); + OBD_FREE_PTR_ARRAY(page_pool, max_pages); RETURN(rc); } @@ -1815,6 +1782,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archive_count, *archive_array = archive_count; ptlrpc_request_set_replen(req); + req->rq_no_resend = 1; rc = mdc_queue_wait(req); GOTO(out, rc); @@ -2037,34 +2005,51 @@ static int mdc_ioc_hsm_ct_start(struct obd_export *exp, static int mdc_quotactl(struct obd_device *unused, struct obd_export *exp, struct obd_quotactl *oqctl) { - struct ptlrpc_request *req; - struct obd_quotactl *oqc; - int rc; + struct ptlrpc_request *req; + struct obd_quotactl *oqc; + int rc; ENTRY; - req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), - &RQF_MDS_QUOTACTL, LUSTRE_MDS_VERSION, - MDS_QUOTACTL); + req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_MDS_QUOTACTL); if (req == NULL) RETURN(-ENOMEM); + + if (LUSTRE_Q_CMD_IS_POOL(oqctl->qc_cmd)) + req_capsule_set_size(&req->rq_pill, + &RMF_OBD_QUOTACTL, + RCL_CLIENT, + sizeof(*oqc) + LOV_MAXPOOLNAME + 1); + + rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, + MDS_QUOTACTL); + if (rc) { + ptlrpc_request_free(req); + RETURN(rc); + } + oqc = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL); - *oqc = *oqctl; + QCTL_COPY(oqc, oqctl); ptlrpc_request_set_replen(req); ptlrpc_at_set_req_timeout(req); rc = ptlrpc_queue_wait(req); - if (rc) - CERROR("ptlrpc_queue_wait failed, rc: %d\n", rc); + if (rc) { + CERROR("%s: ptlrpc_queue_wait failed: rc = %d\n", + exp->exp_obd->obd_name, rc); + GOTO(out, rc); + } if (req->rq_repmsg && (oqc = req_capsule_server_get(&req->rq_pill, &RMF_OBD_QUOTACTL))) { - *oqctl = *oqc; + QCTL_COPY(oqctl, oqc); } else if (!rc) { - CERROR ("Can't unpack obd_quotactl\n"); rc = -EPROTO; + CERROR("%s: cannot unpack obd_quotactl: rc = %d\n", + exp->exp_obd->obd_name, rc); } +out: ptlrpc_req_finished(req); RETURN(rc); @@ -2950,15 +2935,43 @@ static const struct md_ops mdc_md_ops = { .m_rmfid = mdc_rmfid, }; +dev_t mdc_changelog_dev; +struct class *mdc_changelog_class; static int __init mdc_init(void) { - return class_register_type(&mdc_obd_ops, &mdc_md_ops, true, NULL, - LUSTRE_MDC_NAME, &mdc_device_type); + int rc = 0; + rc = alloc_chrdev_region(&mdc_changelog_dev, 0, + MDC_CHANGELOG_DEV_COUNT, + MDC_CHANGELOG_DEV_NAME); + if (rc) + return rc; + + mdc_changelog_class = class_create(THIS_MODULE, MDC_CHANGELOG_DEV_NAME); + if (IS_ERR(mdc_changelog_class)) { + rc = PTR_ERR(mdc_changelog_class); + goto out_dev; + } + + rc = class_register_type(&mdc_obd_ops, &mdc_md_ops, true, + LUSTRE_MDC_NAME, &mdc_device_type); + if (rc) + goto out_class; + + return 0; + +out_class: + class_destroy(mdc_changelog_class); +out_dev: + unregister_chrdev_region(mdc_changelog_dev, MDC_CHANGELOG_DEV_COUNT); + return rc; } static void __exit mdc_exit(void) { - class_unregister_type(LUSTRE_MDC_NAME); + class_unregister_type(LUSTRE_MDC_NAME); + class_destroy(mdc_changelog_class); + unregister_chrdev_region(mdc_changelog_dev, MDC_CHANGELOG_DEV_COUNT); + idr_destroy(&mdc_changelog_minor_idr); } MODULE_AUTHOR("OpenSFS, Inc. ");