X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_disk.c;h=4353f1aba6f84cb5f08b544e17f14b6660b5a4e4;hb=1d116c8ff68fc784141b647b790e4b4861460797;hp=9269ec90ee90e5b27563a5015eeee28cde41c5dd;hpb=0754bc8f2623bea184111af216f7567608db35b6;p=fs%2Flustre-release.git diff --git a/lustre/quota/lquota_disk.c b/lustre/quota/lquota_disk.c index 9269ec9..4353f1a 100644 --- a/lustre/quota/lquota_disk.c +++ b/lustre/quota/lquota_disk.c @@ -21,7 +21,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2015, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi @@ -50,6 +50,7 @@ #define DEBUG_SUBSYSTEM S_LQUOTA +#include #include "lquota_internal.h" #define LQUOTA_MODE (S_IFREG | S_IRUGO | S_IWUSR) @@ -64,10 +65,10 @@ lquota_disk_find_create(const struct lu_env *env, struct dt_device *dev, const struct dt_index_features *idx_feat, char *name) { - struct lquota_thread_info *qti = lquota_info(env); - struct dt_object *obj; - struct local_oid_storage *los; - int rc; + struct lquota_thread_info *qti = lquota_info(env); + struct dt_object *obj; + struct local_oid_storage *los; + int rc; ENTRY; /* Set up local storage */ @@ -84,7 +85,7 @@ lquota_disk_find_create(const struct lu_env *env, struct dt_device *dev, /* local_oid_storage_fini() will finalize the local storage device, * we have to open the object in another device stack */ qti->qti_fid = obj->do_lu.lo_header->loh_fid; - lu_object_put_nocache(env, &obj->do_lu); + dt_object_put_nocache(env, obj); obj = dt_locate(env, dev, &qti->qti_fid); if (IS_ERR(obj)) GOTO(out, obj); @@ -128,7 +129,7 @@ static inline int lquota_disk_slv_filename(const struct lu_fid *glb_fid, name++; /* the filename is composed of the most signicant bits of the global - * FID, that's to say the oid which encodes the pool id, pool type and + * FID, that's to say the oid which encodes the pool type and * quota type, followed by the export UUID */ sprintf(filename, "0x%x-%s", glb_fid->f_oid, name); @@ -196,7 +197,7 @@ struct dt_object *lquota_disk_dir_find_create(const struct lu_env *env, /* local_oid_storage_fini() will finalize the local storage device, * we have to open the object in another device stack */ qti->qti_fid = qt_dir->do_lu.lo_header->loh_fid; - lu_object_put_nocache(env, &qt_dir->do_lu); + dt_object_put_nocache(env, qt_dir); qt_dir = dt_locate(env, dev, &qti->qti_fid); if (IS_ERR(qt_dir)) GOTO(out, rc = PTR_ERR(qt_dir)); @@ -206,12 +207,12 @@ struct dt_object *lquota_disk_dir_find_create(const struct lu_env *env, EXIT; out: if (parent != NULL && !IS_ERR(parent)) - lu_object_put(env, &parent->do_lu); + dt_object_put(env, parent); if (los != NULL) local_oid_storage_fini(env, los); if (rc) { if (qt_dir != NULL && !IS_ERR(qt_dir)) - lu_object_put(env, &qt_dir->do_lu); + dt_object_put(env, qt_dir); qt_dir = ERR_PTR(rc); } return qt_dir; @@ -247,8 +248,7 @@ struct dt_object *lquota_disk_glb_find_create(const struct lu_env *env, idx_feat = &dt_quota_glb_features; /* the filename is composed of the most signicant bits of the FID, - * that's to say the oid which encodes the pool id, pool type and quota - * type */ + * that's to say the oid which encodes the pool type and quota type */ sprintf(qti->qti_buf, "0x%x", fid->f_oid); if (local) { @@ -282,7 +282,7 @@ struct dt_object *lquota_disk_glb_find_create(const struct lu_env *env, CERROR("%s: failed to setup index operations for "DFID " rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name, PFID(lu_object_fid(&glb_idx->do_lu)), rc); - lu_object_put(env, &glb_idx->do_lu); + dt_object_put(env, glb_idx); glb_idx = ERR_PTR(rc); } } @@ -342,7 +342,7 @@ struct dt_object *lquota_disk_slv_find(const struct lu_env *env, CERROR("%s: failed to setup slave index operations for " "%s, rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name, obd_uuid2str(uuid), rc); - lu_object_put(env, &slv_idx->do_lu); + dt_object_put(env, slv_idx); slv_idx = ERR_PTR(rc); } } @@ -381,7 +381,7 @@ struct dt_object *lquota_disk_slv_find_create(const struct lu_env *env, { struct lquota_thread_info *qti = lquota_info(env); struct dt_object *slv_idx; - int rc; + int rc, type; ENTRY; LASSERT(uuid != NULL); @@ -394,20 +394,29 @@ struct dt_object *lquota_disk_slv_find_create(const struct lu_env *env, if (rc) RETURN(ERR_PTR(rc)); + if (lu_device_is_md(dev->dd_lu_dev.ld_site->ls_top_dev)) + type = LDD_F_SV_TYPE_MDT; + else + type = LDD_F_SV_TYPE_OST; + /* Slave indexes uses the FID_SEQ_QUOTA sequence since they can be read * through the network */ qti->qti_fid.f_seq = FID_SEQ_QUOTA; qti->qti_fid.f_ver = 0; if (local) { - int type; + int pool_type, qtype; - rc = lquota_extract_fid(glb_fid, NULL, NULL, &type); + rc = lquota_extract_fid(glb_fid, &pool_type, &qtype); if (rc) RETURN(ERR_PTR(rc)); /* use predefined fid in the reserved oid list */ - qti->qti_fid.f_oid = (type == USRQUOTA) ? LQUOTA_USR_OID - : LQUOTA_GRP_OID; + if ((type == LDD_F_SV_TYPE_MDT && pool_type == LQUOTA_RES_MD) || + (type == LDD_F_SV_TYPE_OST && pool_type == LQUOTA_RES_DT)) + qti->qti_fid.f_oid = qtype2slv_oid(qtype); + else + qti->qti_fid.f_oid = pool_type << 16 | + qtype2slv_oid(qtype); slv_idx = local_index_find_or_create_with_fid(env, dev, &qti->qti_fid, @@ -437,7 +446,7 @@ struct dt_object *lquota_disk_slv_find_create(const struct lu_env *env, CERROR("%s: failed to setup index operations for "DFID " rc:%d\n", dev->dd_lu_dev.ld_obd->obd_name, PFID(lu_object_fid(&slv_idx->do_lu)), rc); - lu_object_put(env, &slv_idx->do_lu); + dt_object_put(env, slv_idx); slv_idx = ERR_PTR(rc); } } @@ -532,7 +541,7 @@ int lquota_disk_for_each_slv(const struct lu_env *env, struct dt_object *parent, if (qti->qti_fid.f_seq != FID_SEQ_QUOTA) goto next; - rc = func(env, glb_fid, (char *)key, &qti->qti_fid, arg); + rc = func(env, glb_fid, qti->qti_buf, &qti->qti_fid, arg); if (rc) break; next: @@ -661,11 +670,11 @@ int lquota_disk_write(const struct lu_env *env, struct thandle *th, if (rec != NULL) { /* insert record with updated quota settings */ - rc = dt_insert(env, obj, rec, key, th, 1); + rc = dt_insert(env, obj, rec, key, th); if (rc) { /* try to insert the old one */ rc = dt_insert(env, obj, (struct dt_rec *)&qti->qti_rec, - key, th, 1); + key, th); LASSERTF(rc == 0, "failed to insert record in quota " "index "DFID"\n", PFID(lu_object_fid(&obj->do_lu))); @@ -783,7 +792,7 @@ int lquota_disk_write_glb(const struct lu_env *env, struct dt_object *obj, rc = 0; } - rc = dt_insert(env, obj, (struct dt_rec *)rec, key, th, 1); + rc = dt_insert(env, obj, (struct dt_rec *)rec, key, th); out_lock: dt_write_unlock(env, obj); out: