X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=f4f3ea85a8ff7247cff819f37ae6ece8613c609e;hb=d527e812461baf9db2f6ed960a3b6cc12d4ab37c;hp=92355fc266397653ebe9a0f1b4f274dcfa1622d4;hpb=9be2db987767a64fdcc20cbf31c37e59a954913c;p=fs%2Flustre-release.git diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c index 92355fc..f4f3ea8 100644 --- a/lustre/osd-zfs/osd_handler.c +++ b/lustre/osd-zfs/osd_handler.c @@ -27,7 +27,6 @@ */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * * lustre/osd-zfs/osd_handler.c * Top-level entry points into osd module @@ -97,8 +96,6 @@ static void arc_prune_func(int64_t bytes, void *private) struct lu_env env; int rc; - LASSERT(site->ls_obj_hash); - rc = lu_env_init(&env, LCT_SHRINKER); if (rc) { CERROR("%s: can't initialize shrinker env: rc = %d\n", @@ -644,6 +641,12 @@ static void osd_conf_get(const struct lu_env *env, param->ddp_brw_size = osd->od_max_blksz; else param->ddp_brw_size = ONE_MB_BRW_SIZE; + +#ifdef HAVE_DMU_OFFSET_NEXT + param->ddp_has_lseek_data_hole = osd->od_sync_on_lseek; +#else + param->ddp_has_lseek_data_hole = false; +#endif } /* @@ -695,17 +698,39 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d) RETURN(0); } -static struct dt_device_operations osd_dt_ops = { - .dt_root_get = osd_root_get, - .dt_statfs = osd_statfs, - .dt_trans_create = osd_trans_create, - .dt_trans_start = osd_trans_start, - .dt_trans_stop = osd_trans_stop, - .dt_trans_cb_add = osd_trans_cb_add, - .dt_conf_get = osd_conf_get, - .dt_sync = osd_sync, - .dt_commit_async = osd_commit_async, - .dt_ro = osd_ro, +/* reserve or free quota for some operation */ +static int osd_reserve_or_free_quota(const struct lu_env *env, + struct dt_device *dev, + enum quota_type type, __u64 uid, + __u64 gid, __s64 count, bool is_md) +{ + int rc; + struct osd_device *osd = osd_dt_dev(dev); + struct osd_thread_info *info = osd_oti_get(env); + struct lquota_id_info *qi = &info->oti_qi; + struct qsd_instance *qsd = NULL; + + if (is_md) + qsd = osd->od_quota_slave_md; + else + qsd = osd->od_quota_slave_dt; + + rc = quota_reserve_or_free(env, qsd, qi, type, uid, gid, count, is_md); + RETURN(rc); +} + +static const struct dt_device_operations osd_dt_ops = { + .dt_root_get = osd_root_get, + .dt_statfs = osd_statfs, + .dt_trans_create = osd_trans_create, + .dt_trans_start = osd_trans_start, + .dt_trans_stop = osd_trans_stop, + .dt_trans_cb_add = osd_trans_cb_add, + .dt_conf_get = osd_conf_get, + .dt_sync = osd_sync, + .dt_commit_async = osd_commit_async, + .dt_ro = osd_ro, + .dt_reserve_or_free_quota = osd_reserve_or_free_quota, }; /* @@ -1066,12 +1091,15 @@ osd_unlinked_drain(const struct lu_env *env, struct osd_device *osd) static int osd_mount(const struct lu_env *env, struct osd_device *o, struct lustre_cfg *cfg) { - char *mntdev = lustre_cfg_string(cfg, 1); - char *str = lustre_cfg_string(cfg, 2); - char *svname = lustre_cfg_string(cfg, 4); + char *mntdev = lustre_cfg_string(cfg, 1); + char *str = lustre_cfg_string(cfg, 2); + char *svname = lustre_cfg_string(cfg, 4); + time64_t interval = AS_DEFAULT; dnode_t *rootdn; - const char *opts; - int rc; + const char *opts; + bool resetoi = false; + int rc; + ENTRY; if (o->od_os != NULL) @@ -1088,6 +1116,8 @@ static int osd_mount(const struct lu_env *env, if (rc >= sizeof(o->od_svname)) RETURN(-E2BIG); + opts = lustre_cfg_string(cfg, 3); + o->od_index_backup_stop = 0; o->od_index = -1; /* -1 means index is invalid */ rc = server_name2index(o->od_svname, &o->od_index, NULL); @@ -1106,7 +1136,7 @@ static int osd_mount(const struct lu_env *env, } if (flags & LMD_FLG_NOSCRUB) - o->od_auto_scrub_interval = AS_NEVER; + interval = AS_NEVER; } if (server_name_is_ost(o->od_svname)) @@ -1158,8 +1188,15 @@ static int osd_mount(const struct lu_env *env, if (rc) GOTO(err, rc); + if (opts && strstr(opts, "resetoi")) + resetoi = true; + + rc = lprocfs_init_brw_stats(&o->od_brw_stats); + if (rc) + GOTO(err, rc); + o->od_in_init = 1; - rc = osd_scrub_setup(env, o); + rc = osd_scrub_setup(env, o, interval, resetoi); o->od_in_init = 0; if (rc) GOTO(err, rc); @@ -1171,8 +1208,8 @@ static int osd_mount(const struct lu_env *env, /* currently it's no need to prepare qsd_instance_md for OST */ if (!o->od_is_ost) { o->od_quota_slave_md = qsd_init(env, o->od_svname, - &o->od_dt_dev, - o->od_proc_entry, true); + &o->od_dt_dev, o->od_proc_entry, + true, false); if (IS_ERR(o->od_quota_slave_md)) { rc = PTR_ERR(o->od_quota_slave_md); o->od_quota_slave_md = NULL; @@ -1181,7 +1218,7 @@ static int osd_mount(const struct lu_env *env, } o->od_quota_slave_dt = qsd_init(env, o->od_svname, &o->od_dt_dev, - o->od_proc_entry, false); + o->od_proc_entry, false, false); if (IS_ERR(o->od_quota_slave_dt)) { if (o->od_quota_slave_md != NULL) { @@ -1202,7 +1239,6 @@ static int osd_mount(const struct lu_env *env, #endif /* parse mount option "noacl", and enable ACL by default */ - opts = lustre_cfg_string(cfg, 3); if (opts == NULL || strstr(opts, "noacl") == NULL) o->od_posix_acl = 1; @@ -1279,7 +1315,7 @@ static int osd_device_init0(const struct lu_env *env, o->od_dt_dev.dd_ops = &osd_dt_ops; sema_init(&o->od_otable_sem, 1); INIT_LIST_HEAD(&o->od_ios_list); - o->od_auto_scrub_interval = AS_DEFAULT; + o->od_sync_on_lseek = B_TRUE; /* ZFS does not support reporting nonrotional status yet, so this flag * is only set if explicitly set by the user. @@ -1341,10 +1377,8 @@ static struct lu_device *osd_device_free(const struct lu_env *env, /* XXX: make osd top device in order to release reference */ d->ld_site->ls_top_dev = d; lu_site_purge(env, d->ld_site, -1); - if (!cfs_hash_is_empty(d->ld_site->ls_obj_hash)) { - LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL); - lu_site_print(env, d->ld_site, &msgdata, lu_cdebug_printer); - } + lu_site_print(env, d->ld_site, &d->ld_site->ls_obj_hash.nelems, + D_ERROR, lu_cdebug_printer); lu_site_fini(&o->od_site); dt_device_fini(&o->od_dt_dev); OBD_FREE_PTR(o); @@ -1359,7 +1393,7 @@ static struct lu_device *osd_device_fini(const struct lu_env *env, int rc; ENTRY; - + osd_index_backup(env, o, false); if (o->od_os) { osd_objset_unregister_callbacks(o); if (!o->od_dt_dev.dd_rdonly) { @@ -1579,7 +1613,7 @@ static int osd_fid_alloc(const struct lu_env *env, struct lu_device *d, return seq_client_alloc_fid(env, osd->od_cl_seq, fid); } -struct lu_device_operations osd_lu_ops = { +const struct lu_device_operations osd_lu_ops = { .ldo_object_alloc = osd_object_alloc, .ldo_process_config = osd_process_config, .ldo_recovery_complete = osd_recovery_complete, @@ -1595,7 +1629,7 @@ static void osd_type_stop(struct lu_device_type *t) { } -static struct lu_device_type_operations osd_device_type_ops = { +static const struct lu_device_type_operations osd_device_type_ops = { .ldto_init = osd_type_init, .ldto_fini = osd_type_fini, @@ -1635,7 +1669,7 @@ static int __init osd_init(void) if (rc) return rc; - rc = class_register_type(&osd_obd_device_ops, NULL, true, NULL, + rc = class_register_type(&osd_obd_device_ops, NULL, true, LUSTRE_OSD_ZFS_NAME, &osd_device_type); if (rc) lu_kmem_fini(osd_caches);