X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_lib.c;h=8bbc58b3591979237561a860481c30265fdf895f;hb=refs%2Fchanges%2F15%2F35815%2F2;hp=bc0716ea59be9863287b90bf50c5a5c69bfcc7be;hpb=294aa9cb666c48e02da1057c222fe5f206ce38fc;p=fs%2Flustre-release.git diff --git a/lustre/quota/lquota_lib.c b/lustre/quota/lquota_lib.c index bc0716e..8bbc58b 100644 --- a/lustre/quota/lquota_lib.c +++ b/lustre/quota/lquota_lib.c @@ -21,17 +21,13 @@ * GPL HEADER END */ /* - * Copyright (c) 2011, 2012, Intel, Inc. + * Copyright (c) 2012, 2017, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi * Author: Niu Yawei */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - #define DEBUG_SUBSYSTEM S_LQUOTA #include @@ -40,7 +36,7 @@ #include "lquota_internal.h" -cfs_mem_cache_t *lqe_kmem; +struct kmem_cache *lqe_kmem; struct lu_kmem_descr lquota_caches[] = { { @@ -58,6 +54,20 @@ LU_KEY_INIT_FINI(lquota, struct lquota_thread_info); LU_CONTEXT_KEY_DEFINE(lquota, LCT_MD_THREAD | LCT_DT_THREAD | LCT_LOCAL); LU_KEY_INIT_GENERIC(lquota); +static inline __u32 qtype2acct_oid(int qtype) +{ + switch (qtype) { + case USRQUOTA: + return ACCT_USER_OID; + case GRPQUOTA: + return ACCT_GROUP_OID; + case PRJQUOTA: + return ACCT_PROJECT_OID; + } + + return ACCT_GROUP_OID; +} + /** * Look-up accounting object to collect space usage information for user * or group. @@ -73,8 +83,7 @@ struct dt_object *acct_obj_lookup(const struct lu_env *env, struct dt_object *obj = NULL; ENTRY; - lu_local_obj_fid(&qti->qti_fid, - type == USRQUOTA ? ACCT_USER_OID : ACCT_GROUP_OID); + lu_local_obj_fid(&qti->qti_fid, qtype2acct_oid(type)); /* lookup the accounting object */ obj = dt_locate(env, dev, &qti->qti_fid); @@ -82,7 +91,7 @@ struct dt_object *acct_obj_lookup(const struct lu_env *env, RETURN(obj); if (!dt_object_exists(obj)) { - lu_object_put(env, &obj->do_lu); + dt_object_put(env, obj); RETURN(ERR_PTR(-ENOENT)); } @@ -95,8 +104,8 @@ struct dt_object *acct_obj_lookup(const struct lu_env *env, CERROR("%s: failed to set up indexing operations for %s" " acct object rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name, - QTYPE_NAME(type), rc); - lu_object_put(env, &obj->do_lu); + qtype_name(type), rc); + dt_object_put(env, obj); RETURN(ERR_PTR(rc)); } } @@ -108,17 +117,26 @@ struct dt_object *acct_obj_lookup(const struct lu_env *env, * * \param env - is the environment passed by the caller * \param dev - is the dt_device storing the slave index object + * \param pool - is the pool type, either LQUOTA_RES_MD or LQUOTA_RES_DT * \param type - is the quota type, either USRQUOTA or GRPQUOTA */ static struct dt_object *quota_obj_lookup(const struct lu_env *env, - struct dt_device *dev, int type) + struct dt_device *dev, int pool, + int type) { struct lquota_thread_info *qti = lquota_info(env); struct dt_object *obj = NULL; + int is_md; ENTRY; + is_md = lu_device_is_md(dev->dd_lu_dev.ld_site->ls_top_dev); + if ((is_md && pool == LQUOTA_RES_MD) || + (!is_md && pool == LQUOTA_RES_DT)) + qti->qti_fid.f_oid = qtype2slv_oid(type); + else + qti->qti_fid.f_oid = pool << 16 | qtype2slv_oid(type); + qti->qti_fid.f_seq = FID_SEQ_QUOTA; - qti->qti_fid.f_oid = type == USRQUOTA ? LQUOTA_USR_OID : LQUOTA_GRP_OID; qti->qti_fid.f_ver = 0; /* lookup the quota object */ @@ -127,7 +145,7 @@ static struct dt_object *quota_obj_lookup(const struct lu_env *env, RETURN(obj); if (!dt_object_exists(obj)) { - lu_object_put(env, &obj->do_lu); + dt_object_put(env, obj); RETURN(ERR_PTR(-ENOENT)); } @@ -141,8 +159,8 @@ static struct dt_object *quota_obj_lookup(const struct lu_env *env, CERROR("%s: failed to set up indexing operations for %s" " slave index object rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name, - QTYPE_NAME(type), rc); - lu_object_put(env, &obj->do_lu); + qtype_name(type), rc); + dt_object_put(env, obj); RETURN(ERR_PTR(rc)); } } @@ -164,7 +182,7 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, { struct lquota_thread_info *qti = lquota_info(env); __u64 key; - struct dt_object *obj; + struct dt_object *obj, *obj_aux = NULL; struct obd_dqblk *dqblk = &oqctl->qc_dqblk; int rc; ENTRY; @@ -177,8 +195,7 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, RETURN(-EOPNOTSUPP); } - if (oqctl->qc_type != USRQUOTA && oqctl->qc_type != GRPQUOTA) - /* no support for directory quota yet */ + if (oqctl->qc_type < 0 || oqctl->qc_type >= LL_MAXQUOTAS) RETURN(-EOPNOTSUPP); /* qc_id is a 32-bit field while a key has 64 bits */ @@ -194,7 +211,7 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, /* lookup record storing space accounting information for this ID */ rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_acct_rec, - (struct dt_key *)&key, BYPASS_CAPA); + (struct dt_key *)&key); if (rc < 0) GOTO(out, rc); @@ -203,11 +220,15 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, dqblk->dqb_curinodes = qti->qti_acct_rec.ispace; dqblk->dqb_valid = QIF_USAGE; - lu_object_put(env, &obj->do_lu); + dt_object_put(env, obj); /* Step 2: collect enforcement information */ - obj = quota_obj_lookup(env, dev, oqctl->qc_type); + if (lu_device_is_md(dev->dd_lu_dev.ld_site->ls_top_dev)) + obj = quota_obj_lookup(env, dev, LQUOTA_RES_MD, oqctl->qc_type); + else + obj = quota_obj_lookup(env, dev, LQUOTA_RES_DT, oqctl->qc_type); + if (IS_ERR(obj)) RETURN(0); if (obj->do_index_ops == NULL) @@ -216,13 +237,31 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, memset(&qti->qti_slv_rec, 0, sizeof(qti->qti_slv_rec)); /* lookup record storing enforcement information for this ID */ rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_slv_rec, - (struct dt_key *)&key, BYPASS_CAPA); + (struct dt_key *)&key); if (rc < 0 && rc != -ENOENT) GOTO(out, rc = 0); if (lu_device_is_md(dev->dd_lu_dev.ld_site->ls_top_dev)) { dqblk->dqb_ihardlimit = qti->qti_slv_rec.qsr_granted; dqblk->dqb_bhardlimit = 0; + + obj_aux = quota_obj_lookup(env, dev, LQUOTA_RES_DT, + oqctl->qc_type); + if (IS_ERR(obj_aux)) { + obj_aux = NULL; + GOTO(out, rc = 0); + } + + if (obj_aux->do_index_ops == NULL) + GOTO(out, rc = 0); + + memset(&qti->qti_slv_rec, 0, sizeof(qti->qti_slv_rec)); + rc = dt_lookup(env, obj_aux, (struct dt_rec *)&qti->qti_slv_rec, + (struct dt_key *)&key); + if (rc < 0 && rc != -ENOENT) + GOTO(out, rc = 0); + + dqblk->dqb_bhardlimit = qti->qti_slv_rec.qsr_granted; } else { dqblk->dqb_ihardlimit = 0; dqblk->dqb_bhardlimit = qti->qti_slv_rec.qsr_granted; @@ -231,112 +270,88 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev, GOTO(out, rc = 0); out: - lu_object_put(env, &obj->do_lu); - return rc; + dt_object_put(env, obj); + if (obj_aux != NULL) + dt_object_put(env, obj_aux); + return rc; } EXPORT_SYMBOL(lquotactl_slv); +static inline __u8 qtype2lqtype(int qtype) +{ + switch (qtype) { + case USRQUOTA: + return LQUOTA_TYPE_USR; + case GRPQUOTA: + return LQUOTA_TYPE_GRP; + case PRJQUOTA: + return LQUOTA_TYPE_PRJ; + } + + return LQUOTA_TYPE_GRP; +} + +static inline int lqtype2qtype(int lqtype) +{ + switch (lqtype) { + case LQUOTA_TYPE_USR: + return USRQUOTA; + case LQUOTA_TYPE_GRP: + return GRPQUOTA; + case LQUOTA_TYPE_PRJ: + return PRJQUOTA; + } + + return GRPQUOTA; +} + /** * Helper routine returning the FID associated with the global index storing - * quota settings for the storage pool \pool_id, resource type \pool_type and + * quota settings for default storage pool, resource type \pool_type and * the quota type \quota_type. */ -void lquota_generate_fid(struct lu_fid *fid, int pool_id, int pool_type, - int quota_type) +void lquota_generate_fid(struct lu_fid *fid, int pool_type, int quota_type) { - __u8 qtype; - - qtype = (quota_type == USRQUOTA) ? LQUOTA_TYPE_USR : LQUOTA_TYPE_GRP; + __u8 lqtype = qtype2lqtype(quota_type); fid->f_seq = FID_SEQ_QUOTA_GLB; - fid->f_oid = (qtype << 24) | (pool_type << 16) | (__u16)pool_id; + fid->f_oid = (lqtype << 24) | (pool_type << 16); fid->f_ver = 0; } /** - * Helper routine used to extract pool ID, pool type and quota type from a + * Helper routine used to extract pool type and quota type from a * given FID. */ -int lquota_extract_fid(const struct lu_fid *fid, int *pool_id, int *pool_type, +int lquota_extract_fid(const struct lu_fid *fid, int *pool_type, int *quota_type) { - unsigned int tmp; + unsigned int lqtype; ENTRY; if (fid->f_seq != FID_SEQ_QUOTA_GLB) RETURN(-EINVAL); - if (pool_id != NULL) { - tmp = fid->f_oid & 0xffffU; - if (tmp != 0) - /* we only support pool ID 0 for the time being */ - RETURN(-ENOTSUPP); - *pool_id = tmp; - } - if (pool_type != NULL) { - tmp = (fid->f_oid >> 16) & 0xffU; - if (tmp >= LQUOTA_LAST_RES) + lqtype = (fid->f_oid >> 16) & 0xffU; + if (lqtype >= LQUOTA_LAST_RES) RETURN(-ENOTSUPP); - *pool_type = tmp; + *pool_type = lqtype; } if (quota_type != NULL) { - tmp = fid->f_oid >> 24; - if (tmp >= LQUOTA_TYPE_MAX) + lqtype = fid->f_oid >> 24; + if (lqtype >= LQUOTA_TYPE_MAX) RETURN(-ENOTSUPP); - *quota_type = (tmp == LQUOTA_TYPE_USR) ? USRQUOTA : GRPQUOTA; + *quota_type = lqtype2qtype(lqtype); } RETURN(0); } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) -/* Index features supported by the global index objects. - * We actually use one dt_index_features structure for each quota combination - * of quota type x [inode, block] to allow the ldiskfs OSD to recognize those - * objects and to handle the conversion from the old administrative quota file - * format */ -struct dt_index_features dt_quota_iusr_features; -EXPORT_SYMBOL(dt_quota_iusr_features); -struct dt_index_features dt_quota_busr_features; -EXPORT_SYMBOL(dt_quota_busr_features); -struct dt_index_features dt_quota_igrp_features; -EXPORT_SYMBOL(dt_quota_igrp_features); -struct dt_index_features dt_quota_bgrp_features; -EXPORT_SYMBOL(dt_quota_bgrp_features); - -/** - * Helper routine returning the right index feature structure to be used - * depending on the FID of the global index. - */ -const struct dt_index_features *glb_idx_feature(struct lu_fid *fid) -{ - int res_type, quota_type, rc; - - rc = lquota_extract_fid(fid, NULL, &res_type, "a_type); - if (rc) - return ERR_PTR(rc); - - if (quota_type == USRQUOTA) { - if (res_type == LQUOTA_RES_MD) - return &dt_quota_iusr_features; - else - return &dt_quota_busr_features; - } else { - if (res_type == LQUOTA_RES_MD) - return &dt_quota_igrp_features; - else - return &dt_quota_bgrp_features; - } -} -#else -#warning "remove old quota compatibility code" -#endif - -static int __init init_lquota(void) +static int __init lquota_init(void) { int rc; ENTRY; @@ -344,13 +359,6 @@ static int __init init_lquota(void) lquota_key_init_generic(&lquota_thread_key, NULL); lu_context_key_register(&lquota_thread_key); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) - dt_quota_iusr_features = dt_quota_busr_features = dt_quota_glb_features; - dt_quota_igrp_features = dt_quota_bgrp_features = dt_quota_glb_features; -#else -#warning "remove old quota compatibility code" -#endif - rc = lu_kmem_init(lquota_caches); if (rc) GOTO(out_key, rc); @@ -374,7 +382,7 @@ out_key: return rc; } -static void exit_lquota(void) +static void __exit lquota_exit(void) { qsd_glb_fini(); qmt_glb_fini(); @@ -382,8 +390,10 @@ static void exit_lquota(void) lu_context_key_degister(&lquota_thread_key); } -MODULE_AUTHOR("Intel, Inc. "); +MODULE_AUTHOR("OpenSFS, Inc. "); MODULE_DESCRIPTION("Lustre Quota"); +MODULE_VERSION(LUSTRE_VERSION_STRING); MODULE_LICENSE("GPL"); -cfs_module(lquota, "2.4.0", init_lquota, exit_lquota); +module_init(lquota_init); +module_exit(lquota_exit);