X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_handler.c;h=23d684c7dbad1be2a8a392b61c01a69f6ce1221f;hp=6bd4bf4fc551b629dd9eb82bfc70a7450389fa61;hb=8d1639b5cf1edbc885876956dcd6189173c00955;hpb=c1baab294d7efb10a2e81cefc12dbc8103c8f175 diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c index 6bd4bf4..23d684c 100644 --- a/lustre/osd-zfs/osd_handler.c +++ b/lustre/osd-zfs/osd_handler.c @@ -15,22 +15,15 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. - */ -/* - * Copyright (c) 2011, 2012 Whamcloud, Inc. - * Use is subject to license terms. * + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,12 +37,8 @@ * Author: Johann Lombardi */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_OSD -#include #include #include #include @@ -57,6 +46,8 @@ #include #include #include +#include +#include #include "osd_internal.h" @@ -75,10 +66,13 @@ struct lu_context_key osd_key; -static char *root_tag = "osd_mount, rootdb"; +static int osd_txg_sync_delay_us = -1; /* Slab for OSD object allocation */ -cfs_mem_cache_t *osd_object_kmem; +struct kmem_cache *osd_object_kmem; + +/* Slab to allocate osd_zap_it */ +struct kmem_cache *osd_zapit_cachep; static struct lu_kmem_descr osd_caches[] = { { @@ -87,6 +81,11 @@ static struct lu_kmem_descr osd_caches[] = { .ckd_size = sizeof(struct osd_object) }, { + .ckd_cache = &osd_zapit_cachep, + .ckd_name = "osd_zapit_cache", + .ckd_size = sizeof(struct osd_zap_it) + }, + { .ckd_cache = NULL } }; @@ -98,6 +97,8 @@ 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", @@ -149,8 +150,13 @@ static void osd_trans_commit_cb(void *cb_data, int error) dt_txn_hook_commit(th); /* call per-transaction callbacks if any */ - cfs_list_for_each_entry_safe(dcb, tmp, &oh->ot_dcb_list, dcb_linkage) + list_for_each_entry_safe(dcb, tmp, &oh->ot_dcb_list, dcb_linkage) { + LASSERTF(dcb->dcb_magic == TRANS_COMMIT_CB_MAGIC, + "commit callback entry: magic=%x name='%s'\n", + dcb->dcb_magic, dcb->dcb_name); + list_del_init(&dcb->dcb_linkage); dcb->dcb_func(NULL, th, dcb, error); + } /* Unlike ldiskfs, zfs updates space accounting at commit time. * As a consequence, op_end is called only now to inform the quota slave @@ -162,8 +168,6 @@ static void osd_trans_commit_cb(void *cb_data, int error) lu_device_put(lud); th->th_dev = NULL; - lu_context_exit(&th->th_ctx); - lu_context_fini(&th->th_ctx); OBD_FREE_PTR(oh); EXIT; @@ -171,10 +175,15 @@ static void osd_trans_commit_cb(void *cb_data, int error) static int osd_trans_cb_add(struct thandle *th, struct dt_txn_commit_cb *dcb) { - struct osd_thandle *oh; + struct osd_thandle *oh = container_of0(th, struct osd_thandle, + ot_super); - oh = container_of0(th, struct osd_thandle, ot_super); - cfs_list_add(&dcb->dcb_linkage, &oh->ot_dcb_list); + LASSERT(dcb->dcb_magic == TRANS_COMMIT_CB_MAGIC); + LASSERT(&dcb->dcb_func != NULL); + if (dcb->dcb_flags & DCB_TRANS_STOP) + list_add(&dcb->dcb_linkage, &oh->ot_stop_dcb_list); + else + list_add(&dcb->dcb_linkage, &oh->ot_dcb_list); return 0; } @@ -207,42 +216,82 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d, struct osd_device *osd = osd_dt_dev(d); /* dmu will call commit callback with error code during abort */ if (!lu_device_is_md(&d->dd_lu_dev) && rc == -ENOSPC) - CERROR("%s: failed to start transaction due to ENOSPC. " - "Metadata overhead is underestimated or " - "grant_ratio is too low.\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name); + CERROR("%s: failed to start transaction due to ENOSPC" + "\n", osd->od_svname); else CERROR("%s: can't assign tx: rc = %d\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, rc); + osd->od_svname, rc); } else { /* add commit callback */ dmu_tx_callback_register(oh->ot_tx, osd_trans_commit_cb, oh); oh->ot_assigned = 1; - lu_context_init(&th->th_ctx, th->th_tags); - lu_context_enter(&th->th_ctx); + osd_oti_get(env)->oti_in_trans = 1; lu_device_get(&d->dd_lu_dev); } RETURN(rc); } +static void osd_unlinked_list_emptify(const struct lu_env *env, + struct osd_device *osd, + struct list_head *list, bool free) +{ + struct osd_object *obj; + uint64_t oid; + + while (!list_empty(list)) { + obj = list_entry(list->next, + struct osd_object, oo_unlinked_linkage); + LASSERT(obj->oo_dn != NULL); + oid = obj->oo_dn->dn_object; + + list_del_init(&obj->oo_unlinked_linkage); + if (free) + (void)osd_unlinked_object_free(env, osd, oid); + } +} + +static void osd_trans_stop_cb(struct osd_thandle *oth, int result) +{ + struct dt_txn_commit_cb *dcb; + struct dt_txn_commit_cb *tmp; + + /* call per-transaction stop callbacks if any */ + list_for_each_entry_safe(dcb, tmp, &oth->ot_stop_dcb_list, + dcb_linkage) { + LASSERTF(dcb->dcb_magic == TRANS_COMMIT_CB_MAGIC, + "commit callback entry: magic=%x name='%s'\n", + dcb->dcb_magic, dcb->dcb_name); + list_del_init(&dcb->dcb_linkage); + dcb->dcb_func(NULL, &oth->ot_super, dcb, result); + } +} + /* * Concurrency: shouldn't matter. */ -static int osd_trans_stop(const struct lu_env *env, struct thandle *th) +static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, + struct thandle *th) { struct osd_device *osd = osd_dt_dev(th->th_dev); + bool sync = (th->th_sync != 0); struct osd_thandle *oh; + struct list_head unlinked; uint64_t txg; int rc; ENTRY; oh = container_of0(th, struct osd_thandle, ot_super); + INIT_LIST_HEAD(&unlinked); + list_splice_init(&oh->ot_unlinked_list, &unlinked); + /* reset OI cache for safety */ + osd_oti_get(env)->oti_ins_cache_used = 0; if (oh->ot_assigned == 0) { LASSERT(oh->ot_tx); dmu_tx_abort(oh->ot_tx); - osd_object_sa_dirty_rele(oh); + osd_object_sa_dirty_rele(env, oh); + osd_unlinked_list_emptify(env, osd, &unlinked, false); /* there won't be any commit, release reserved quota space now, * if any */ qsd_op_end(env, osd->od_quota_slave, &oh->ot_quota_trans); @@ -250,29 +299,30 @@ static int osd_trans_stop(const struct lu_env *env, struct thandle *th) RETURN(0); } - /* When doing our own inode accounting, the ZAPs storing per-uid/gid - * usage are updated at operation execution time, so we should call - * qsd_op_end() straight away. Otherwise (for blk accounting maintained - * by ZFS and when #inode is estimated from #blks) accounting is updated - * at commit time and the call to qsd_op_end() must be delayed */ - if (oh->ot_quota_trans.lqt_id_cnt > 0 && - !oh->ot_quota_trans.lqt_ids[0].lqi_is_blk && - !osd->od_quota_iused_est) - qsd_op_end(env, osd->od_quota_slave, &oh->ot_quota_trans); - rc = dt_txn_hook_stop(env, th); if (rc != 0) CDEBUG(D_OTHER, "%s: transaction hook failed: rc = %d\n", osd->od_svname, rc); + osd_trans_stop_cb(oh, rc); + LASSERT(oh->ot_tx); txg = oh->ot_tx->tx_txg; - osd_object_sa_dirty_rele(oh); + osd_object_sa_dirty_rele(env, oh); + /* XXX: Once dmu_tx_commit() called, oh/th could have been freed + * by osd_trans_commit_cb already. */ dmu_tx_commit(oh->ot_tx); + osd_oti_get(env)->oti_in_trans = 0; + + osd_unlinked_list_emptify(env, osd, &unlinked, true); - if (th->th_sync) - txg_wait_synced(dmu_objset_pool(osd->od_objset.os), txg); + if (sync) { + if (osd_txg_sync_delay_us < 0) + txg_wait_synced(dmu_objset_pool(osd->od_os), txg); + else + udelay(osd_txg_sync_delay_us); + } RETURN(rc); } @@ -286,7 +336,15 @@ static struct thandle *osd_trans_create(const struct lu_env *env, dmu_tx_t *tx; ENTRY; - tx = dmu_tx_create(osd->od_objset.os); + if (dt->dd_rdonly) { + CERROR("%s: someone try to start transaction under " + "readonly mode, should be disabled.\n", + osd_name(osd_dt_dev(dt))); + dump_stack(); + RETURN(ERR_PTR(-EROFS)); + } + + tx = dmu_tx_create(osd->od_os); if (tx == NULL) RETURN(ERR_PTR(-ENOMEM)); @@ -298,36 +356,223 @@ static struct thandle *osd_trans_create(const struct lu_env *env, } oh->ot_tx = tx; - CFS_INIT_LIST_HEAD(&oh->ot_dcb_list); - CFS_INIT_LIST_HEAD(&oh->ot_sa_list); - cfs_sema_init(&oh->ot_sa_lock, 1); + INIT_LIST_HEAD(&oh->ot_dcb_list); + INIT_LIST_HEAD(&oh->ot_stop_dcb_list); + INIT_LIST_HEAD(&oh->ot_unlinked_list); + INIT_LIST_HEAD(&oh->ot_sa_list); memset(&oh->ot_quota_trans, 0, sizeof(oh->ot_quota_trans)); th = &oh->ot_super; th->th_dev = dt; th->th_result = 0; - th->th_tags = LCT_TX_HANDLE; RETURN(th); } +/* Estimate the total number of objects from a number of blocks */ +uint64_t osd_objs_count_estimate(uint64_t usedbytes, uint64_t usedobjs, + uint64_t nrblocks, uint64_t est_maxblockshift) +{ + uint64_t est_totobjs, est_usedblocks, est_usedobjs; + + /* + * If blocksize is below 64KB (e.g. MDT with recordsize=4096) then + * bump the free dnode estimate to assume blocks at least 64KB in + * case of a directory-heavy MDT (at 32KB/directory). + */ + if (est_maxblockshift < 16) { + nrblocks >>= (16 - est_maxblockshift); + est_maxblockshift = 16; + } + + /* + * Estimate the total number of dnodes from the total blocks count + * and the space used per dnode. Since we don't know the overhead + * associated with each dnode (xattrs, SAs, VDEV overhead, etc.) + * just using DNODE_SHIFT isn't going to give a good estimate. + * Instead, compute the current average space usage per dnode, with + * an upper and lower cap to avoid unrealistic estimates.. + * + * In case there aren't many dnodes or blocks used yet, add a small + * correction factor (OSD_DNODE_EST_{COUNT,BLKSHIFT}). This factor + * gradually disappears as the number of real dnodes grows. It also + * avoids the need to check for divide-by-zero computing dn_per_block. + */ + CLASSERT(OSD_DNODE_MIN_BLKSHIFT > 0); + CLASSERT(OSD_DNODE_EST_BLKSHIFT > 0); + + est_usedblocks = ((OSD_DNODE_EST_COUNT << OSD_DNODE_EST_BLKSHIFT) + + usedbytes) >> est_maxblockshift; + est_usedobjs = OSD_DNODE_EST_COUNT + usedobjs; + + if (est_usedobjs <= est_usedblocks) { + /* + * Average space/dnode more than maximum block size, use max + * block size to estimate free dnodes from adjusted free blocks + * count. OSTs typically use multiple blocks per dnode so this + * case applies. + */ + est_totobjs = nrblocks; + + } else if (est_usedobjs >= (est_usedblocks << OSD_DNODE_MIN_BLKSHIFT)) { + /* + * Average space/dnode smaller than min dnode size (probably + * due to metadnode compression), use min dnode size to + * estimate object count. MDTs may use only one block per node + * so this case applies. + */ + est_totobjs = nrblocks << OSD_DNODE_MIN_BLKSHIFT; + + } else { + /* + * Between the extremes, use average space per existing dnode + * to compute the number of dnodes that will fit into nrblocks: + * + * est_totobjs = nrblocks * (est_usedobjs / est_usedblocks) + * + * this may overflow 64 bits or become 0 if not handled well. + * + * We know nrblocks is below 2^(64 - blkbits) bits, and + * est_usedobjs is under 48 bits due to DN_MAX_OBJECT_SHIFT, + * which means that multiplying them may get as large as + * 2 ^ 96 for the minimum blocksize of 64KB allowed above. + * + * The ratio of dnodes per block (est_usedobjs / est_usedblocks) + * is under 2^(blkbits - DNODE_SHIFT) = blocksize / 512 due to + * the limit checks above, so we can safely compute this first. + * We care more about accuracy on the MDT (many dnodes/block) + * which is good because this is where truncation errors are + * smallest. Since both nrblocks and dn_per_block are a + * function of blkbits, their product is at most: + * + * 2^(64 - blkbits) * 2^(blkbits - DNODE_SHIFT) = 2^(64 - 9) + * + * so we can safely use 7 bits to compute a fixed-point + * fraction and est_totobjs can still fit in 64 bits. + */ + unsigned dn_per_block = (est_usedobjs << 7) / est_usedblocks; + + est_totobjs = (nrblocks * dn_per_block) >> 7; + } + return est_totobjs; +} + +static int osd_objset_statfs(struct osd_device *osd, struct obd_statfs *osfs) +{ + struct objset *os = osd->od_os; + uint64_t usedbytes, availbytes, usedobjs, availobjs; + uint64_t est_availobjs; + uint64_t reserved; + uint64_t bshift; + + dmu_objset_space(os, &usedbytes, &availbytes, &usedobjs, &availobjs); + + memset(osfs, 0, sizeof(*osfs)); + + /* We're a zfs filesystem. */ + osfs->os_type = UBERBLOCK_MAGIC; + + /* + * ZFS allows multiple block sizes. For statfs, Linux makes no + * proper distinction between bsize and frsize. For calculations + * of free and used blocks incorrectly uses bsize instead of frsize, + * but bsize is also used as the optimal blocksize. We return the + * largest possible block size as IO size for the optimum performance + * and scale the free and used blocks count appropriately. + */ + osfs->os_bsize = osd->od_max_blksz; + bshift = fls64(osfs->os_bsize) - 1; + + osfs->os_blocks = (usedbytes + availbytes) >> bshift; + osfs->os_bfree = availbytes >> bshift; + osfs->os_bavail = osfs->os_bfree; /* no extra root reservation */ + + /* Take replication (i.e. number of copies) into account */ + if (os->os_copies != 0) + osfs->os_bavail /= os->os_copies; + + /* + * Reserve some space so we don't run into ENOSPC due to grants not + * accounting for metadata overhead in ZFS, and to avoid fragmentation. + * Rather than report this via os_bavail (which makes users unhappy if + * they can't fill the filesystem 100%), reduce os_blocks as well. + * + * Reserve 0.78% of total space, at least 16MB for small filesystems, + * for internal files to be created/unlinked when space is tight. + */ + CLASSERT(OSD_STATFS_RESERVED_SIZE > 0); + reserved = OSD_STATFS_RESERVED_SIZE >> bshift; + if (likely(osfs->os_blocks >= reserved << OSD_STATFS_RESERVED_SHIFT)) + reserved = osfs->os_blocks >> OSD_STATFS_RESERVED_SHIFT; + + osfs->os_blocks -= reserved; + osfs->os_bfree -= min(reserved, osfs->os_bfree); + osfs->os_bavail -= min(reserved, osfs->os_bavail); + + /* + * The availobjs value returned from dmu_objset_space() is largely + * useless, since it reports the number of objects that might + * theoretically still fit into the dataset, independent of minor + * issues like how much space is actually available in the pool. + * Compute a better estimate in udmu_objs_count_estimate(). + */ + est_availobjs = osd_objs_count_estimate(usedbytes, usedobjs, + osfs->os_bfree, bshift); + + osfs->os_ffree = min(availobjs, est_availobjs); + osfs->os_files = osfs->os_ffree + usedobjs; + + /* ZFS XXX: fill in backing dataset FSID/UUID + memcpy(osfs->os_fsid, .... );*/ + + osfs->os_namelen = MAXNAMELEN; + osfs->os_maxbytes = OBD_OBJECT_EOF; + + if (!spa_writeable(dmu_objset_spa(os)) || + osd->od_dev_set_rdonly || osd->od_prop_rdonly) + osfs->os_state |= OS_STATE_READONLY; + + return 0; +} + /* * Concurrency: shouldn't matter. */ int osd_statfs(const struct lu_env *env, struct dt_device *d, struct obd_statfs *osfs) { - struct osd_device *osd = osd_dt_dev(d); int rc; ENTRY; - rc = udmu_objset_statfs(&osd->od_objset, osfs); - if (rc) + rc = osd_objset_statfs(osd_dt_dev(d), osfs); + if (unlikely(rc != 0)) RETURN(rc); - osfs->os_bavail -= min_t(obd_size, + + osfs->os_bavail -= min_t(u64, OSD_GRANT_FOR_LOCAL_OIDS / osfs->os_bsize, osfs->os_bavail); RETURN(0); } +static int osd_blk_insert_cost(struct osd_device *osd) +{ + int max_blockshift, nr_blkptrshift, bshift; + + /* max_blockshift is the log2 of the number of blocks needed to reach + * the maximum filesize (that's to say 2^64) */ + bshift = osd_spa_maxblockshift(dmu_objset_spa(osd->od_os)); + max_blockshift = DN_MAX_OFFSET_SHIFT - bshift; + + /* nr_blkptrshift is the log2 of the number of block pointers that can + * be stored in an indirect block */ + CLASSERT(DN_MAX_INDBLKSHIFT > SPA_BLKPTRSHIFT); + nr_blkptrshift = DN_MAX_INDBLKSHIFT - SPA_BLKPTRSHIFT; + + /* max_blockshift / nr_blkptrshift is thus the maximum depth of the + * tree. We add +1 for rounding purpose. + * The tree depth times the indirect block size gives us the maximum + * cost of inserting a block in the tree */ + return (max_blockshift / nr_blkptrshift + 1) * (1<ddp_max_name_len = MAXNAMELEN; - param->ddp_max_nlink = 1 << 31; /* it's 8byte on a disk */ - param->ddp_block_shift = 12; /* XXX */ - param->ddp_mount_type = LDD_MT_ZFS; + param->ddp_max_name_len = MAXNAMELEN; + param->ddp_max_nlink = 1 << 31; /* it's 8byte on a disk */ + param->ddp_symlink_max = PATH_MAX; + param->ddp_mount_type = LDD_MT_ZFS; - param->ddp_mntopts = MNTOPT_USERXATTR | MNTOPT_ACL; - param->ddp_max_ea_size = DXATTR_MAX_ENTRY_SIZE; + param->ddp_mntopts = MNTOPT_USERXATTR; + if (osd->od_posix_acl) + param->ddp_mntopts |= MNTOPT_ACL; + param->ddp_max_ea_size = DXATTR_MAX_ENTRY_SIZE; /* for maxbytes, report same value as ZPL */ - param->ddp_maxbytes = MAX_LFS_FILESIZE; - - /* Default reserved fraction of the available space that should be kept - * for error margin. Unfortunately, there are many factors that can - * impact the overhead with zfs, so let's be very cautious for now and - * reserve 20% of the available space which is not given out as grant. - * This tunable can be changed on a live system via procfs if needed. */ - param->ddp_grant_reserved = 20; + param->ddp_maxbytes = MAX_LFS_FILESIZE; /* inodes are dynamically allocated, so we report the per-inode space * consumption to upper layers. This static value is not really accurate * and we should use the same logic as in udmu_objset_statfs() to * estimate the real size consumed by an object */ param->ddp_inodespace = OSD_DNODE_EST_COUNT; - /* per-fragment overhead to be used by the client code */ - param->ddp_grant_frag = udmu_blk_insert_cost(); - - param->ddp_mnt = NULL; + /* Although ZFS isn't an extent-based filesystem, the metadata overhead + * (i.e. 7 levels of indirect blocks, see osd_blk_insert_cost()) should + * not be accounted for every single new block insertion. + * Instead, the maximum extent size is set to the number of blocks that + * can fit into a single contiguous indirect block. There would be some + * cases where this crosses indirect blocks, but it also won't have 7 + * new levels of indirect blocks in that case either, so it will still + * have enough reserved space for the extra indirect block */ + param->ddp_max_extent_blks = + (1 << (DN_MAX_INDBLKSHIFT - SPA_BLKPTRSHIFT)); + param->ddp_extent_tax = osd_blk_insert_cost(osd); + + /* Preferred RPC size for efficient disk IO. 1MB shows good + * all-around performance for ZFS, but use blocksize (recordsize) + * by default if larger to avoid read-modify-write. */ + if (osd->od_max_blksz > ONE_MB_BRW_SIZE) + param->ddp_brw_size = osd->od_max_blksz; + else + param->ddp_brw_size = ONE_MB_BRW_SIZE; } /* @@ -372,18 +629,24 @@ static void osd_conf_get(const struct lu_env *env, */ static int osd_sync(const struct lu_env *env, struct dt_device *d) { - struct osd_device *osd = osd_dt_dev(d); - CDEBUG(D_HA, "syncing OSD %s\n", LUSTRE_OSD_ZFS_NAME); - txg_wait_synced(dmu_objset_pool(osd->od_objset.os), 0ULL); + if (!d->dd_rdonly) { + struct osd_device *osd = osd_dt_dev(d); + + CDEBUG(D_CACHE, "syncing OSD %s\n", LUSTRE_OSD_ZFS_NAME); + txg_wait_synced(dmu_objset_pool(osd->od_os), 0ULL); + CDEBUG(D_CACHE, "synced OSD %s\n", LUSTRE_OSD_ZFS_NAME); + } + return 0; } static int osd_commit_async(const struct lu_env *env, struct dt_device *dev) { struct osd_device *osd = osd_dt_dev(dev); - tx_state_t *tx = &dmu_objset_pool(osd->od_objset.os)->dp_tx; + tx_state_t *tx = &dmu_objset_pool(osd->od_os)->dp_tx; uint64_t txg; + mutex_enter(&tx->tx_sync_lock); txg = tx->tx_open_txg + 1; if (tx->tx_quiesce_txg_waiting < txg) { tx->tx_quiesce_txg_waiting = txg; @@ -404,26 +667,8 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d) CERROR("%s: *** setting device %s read-only ***\n", osd->od_svname, LUSTRE_OSD_ZFS_NAME); - osd->od_rdonly = 1; - spa_freeze(dmu_objset_spa(osd->od_objset.os)); - - RETURN(0); -} - -/* - * Concurrency: serialization provided by callers. - */ -static int osd_init_capa_ctxt(const struct lu_env *env, struct dt_device *d, - int mode, unsigned long timeout, __u32 alg, - struct lustre_capa_key *keys) -{ - struct osd_device *dev = osd_dt_dev(d); - ENTRY; - - dev->od_fl_capa = mode; - dev->od_capa_timeout = timeout; - dev->od_capa_alg = alg; - dev->od_capa_keys = keys; + osd->od_dev_set_rdonly = 1; + spa_freeze(dmu_objset_spa(osd->od_os)); RETURN(0); } @@ -439,7 +684,6 @@ static struct dt_device_operations osd_dt_ops = { .dt_sync = osd_sync, .dt_commit_async = osd_commit_async, .dt_ro = osd_ro, - .dt_init_capa_ctxt = osd_init_capa_ctxt, }; /* @@ -473,16 +717,21 @@ static void osd_key_fini(const struct lu_context *ctx, struct lu_context_key *key, void *data) { struct osd_thread_info *info = data; + struct osd_idmap_cache *idc = info->oti_ins_cache; + if (idc != NULL) { + LASSERT(info->oti_ins_cache_size > 0); + OBD_FREE(idc, sizeof(*idc) * info->oti_ins_cache_size); + info->oti_ins_cache = NULL; + info->oti_ins_cache_size = 0; + } + lu_buf_free(&info->oti_xattr_lbuf); OBD_FREE_PTR(info); } static void osd_key_exit(const struct lu_context *ctx, struct lu_context_key *key, void *data) { - struct osd_thread_info *info = data; - - memset(info, 0, sizeof(*info)); } struct lu_context_key osd_key = { @@ -492,78 +741,431 @@ struct lu_context_key osd_key = { .lct_exit = osd_key_exit }; +static void osd_fid_fini(const struct lu_env *env, struct osd_device *osd) +{ + if (osd->od_cl_seq == NULL) + return; + + seq_client_fini(osd->od_cl_seq); + OBD_FREE_PTR(osd->od_cl_seq); + osd->od_cl_seq = NULL; +} + static int osd_shutdown(const struct lu_env *env, struct osd_device *o) { ENTRY; /* shutdown quota slave instance associated with the device */ if (o->od_quota_slave != NULL) { + /* complete all in-flight callbacks */ + osd_sync(env, &o->od_dt_dev); + txg_wait_callbacks(spa_get_dsl(dmu_objset_spa(o->od_os))); qsd_fini(env, o->od_quota_slave); o->od_quota_slave = NULL; } + osd_fid_fini(env, o); + RETURN(0); } +static void osd_xattr_changed_cb(void *arg, uint64_t newval) +{ + struct osd_device *osd = arg; + + osd->od_xattr_in_sa = (newval == ZFS_XATTR_SA); +} + +static void osd_recordsize_changed_cb(void *arg, uint64_t newval) +{ + struct osd_device *osd = arg; + + LASSERT(newval <= osd_spa_maxblocksize(dmu_objset_spa(osd->od_os))); + LASSERT(newval >= SPA_MINBLOCKSIZE); + LASSERT(ISP2(newval)); + + osd->od_max_blksz = newval; +} + +static void osd_readonly_changed_cb(void *arg, uint64_t newval) +{ + struct osd_device *osd = arg; + + osd->od_prop_rdonly = !!newval; +} + +#ifdef HAVE_DMU_OBJECT_ALLOC_DNSIZE +static void osd_dnodesize_changed_cb(void *arg, uint64_t newval) +{ + struct osd_device *osd = arg; + + osd->od_dnsize = newval; +} +#endif +/* + * This function unregisters all registered callbacks. It's harmless to + * unregister callbacks that were never registered so it is used to safely + * unwind a partially completed call to osd_objset_register_callbacks(). + */ +static void osd_objset_unregister_callbacks(struct osd_device *o) +{ + struct dsl_dataset *ds = dmu_objset_ds(o->od_os); + + (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_XATTR), + osd_xattr_changed_cb, o); + (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_RECORDSIZE), + osd_recordsize_changed_cb, o); + (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_READONLY), + osd_readonly_changed_cb, o); +#ifdef HAVE_DMU_OBJECT_ALLOC_DNSIZE + (void) dsl_prop_unregister(ds, zfs_prop_to_name(ZFS_PROP_DNODESIZE), + osd_dnodesize_changed_cb, o); +#endif + + if (o->arc_prune_cb != NULL) { + arc_remove_prune_callback(o->arc_prune_cb); + o->arc_prune_cb = NULL; + } +} + +/* + * Register the required callbacks to be notified when zfs properties + * are modified using the 'zfs(8)' command line utility. + */ +static int osd_objset_register_callbacks(struct osd_device *o) +{ + struct dsl_dataset *ds = dmu_objset_ds(o->od_os); + dsl_pool_t *dp = dmu_objset_pool(o->od_os); + int rc; + + LASSERT(ds); + LASSERT(dp); + + dsl_pool_config_enter(dp, FTAG); + rc = -dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_XATTR), + osd_xattr_changed_cb, o); + if (rc) + GOTO(err, rc); + + rc = -dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_RECORDSIZE), + osd_recordsize_changed_cb, o); + if (rc) + GOTO(err, rc); + + rc = -dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_READONLY), + osd_readonly_changed_cb, o); + if (rc) + GOTO(err, rc); + +#ifdef HAVE_DMU_OBJECT_ALLOC_DNSIZE + rc = -dsl_prop_register(ds, zfs_prop_to_name(ZFS_PROP_DNODESIZE), + osd_dnodesize_changed_cb, o); + if (rc) + GOTO(err, rc); +#endif + + o->arc_prune_cb = arc_add_prune_callback(arc_prune_func, o); +err: + dsl_pool_config_exit(dp, FTAG); + if (rc) + osd_objset_unregister_callbacks(o); + + RETURN(rc); +} + +static int osd_objset_open(struct osd_device *o) +{ + uint64_t version = ZPL_VERSION; + uint64_t sa_obj, unlink_obj; + int rc; + ENTRY; + + rc = -osd_dmu_objset_own(o->od_mntdev, DMU_OST_ZFS, + o->od_dt_dev.dd_rdonly ? B_TRUE : B_FALSE, + B_FALSE, o, &o->od_os); + + if (rc) { + CERROR("%s: can't open %s\n", o->od_svname, o->od_mntdev); + o->od_os = NULL; + + GOTO(out, rc); + } + + /* Check ZFS version */ + rc = -zap_lookup(o->od_os, MASTER_NODE_OBJ, + ZPL_VERSION_STR, 8, 1, &version); + if (rc) { + CERROR("%s: Error looking up ZPL VERSION\n", o->od_mntdev); + /* + * We can't return ENOENT because that would mean the objset + * didn't exist. + */ + GOTO(out, rc = -EIO); + } + + rc = -zap_lookup(o->od_os, MASTER_NODE_OBJ, + ZFS_SA_ATTRS, 8, 1, &sa_obj); + if (rc) + GOTO(out, rc); + + rc = -sa_setup(o->od_os, sa_obj, zfs_attr_table, + ZPL_END, &o->z_attr_table); + if (rc) + GOTO(out, rc); + + rc = -zap_lookup(o->od_os, MASTER_NODE_OBJ, ZFS_ROOT_OBJ, + 8, 1, &o->od_rootid); + if (rc) { + CERROR("%s: lookup for root failed: rc = %d\n", + o->od_svname, rc); + GOTO(out, rc); + } + + rc = -zap_lookup(o->od_os, MASTER_NODE_OBJ, ZFS_UNLINKED_SET, + 8, 1, &unlink_obj); + if (rc) { + CERROR("%s: lookup for %s failed: rc = %d\n", + o->od_svname, ZFS_UNLINKED_SET, rc); + GOTO(out, rc); + } + + /* Check that user/group usage tracking is supported */ + if (!dmu_objset_userused_enabled(o->od_os) || + DMU_USERUSED_DNODE(o->od_os)->dn_type != DMU_OT_USERGROUP_USED || + DMU_GROUPUSED_DNODE(o->od_os)->dn_type != DMU_OT_USERGROUP_USED) { + CERROR("%s: Space accounting not supported by this target, " + "aborting\n", o->od_svname); + GOTO(out, rc = -ENOTSUPP); + } + + rc = __osd_obj2dnode(o->od_os, unlink_obj, &o->od_unlinked); + if (rc) { + CERROR("%s: can't get dnode for unlinked: rc = %d\n", + o->od_svname, rc); + GOTO(out, rc); + } + +out: + if (rc != 0 && o->od_os != NULL) { + osd_dmu_objset_disown(o->od_os, B_FALSE, o); + o->od_os = NULL; + } + + RETURN(rc); +} + +int osd_unlinked_object_free(const struct lu_env *env, struct osd_device *osd, + uint64_t oid) +{ + char *key = osd_oti_get(env)->oti_str; + int rc; + dmu_tx_t *tx; + + if (osd->od_dt_dev.dd_rdonly) { + CERROR("%s: someone try to free objects under " + "readonly mode, should be disabled.\n", osd_name(osd)); + dump_stack(); + + return -EROFS; + } + + rc = -dmu_free_long_range(osd->od_os, oid, 0, DMU_OBJECT_END); + if (rc != 0) { + CWARN("%s: Cannot truncate %llu: rc = %d\n", + osd->od_svname, oid, rc); + return rc; + } + + tx = dmu_tx_create(osd->od_os); + dmu_tx_mark_netfree(tx); + dmu_tx_hold_free(tx, oid, 0, DMU_OBJECT_END); + osd_tx_hold_zap(tx, osd->od_unlinked->dn_object, osd->od_unlinked, + FALSE, NULL); + rc = -dmu_tx_assign(tx, TXG_WAIT); + if (rc != 0) { + CWARN("%s: Cannot assign tx for %llu: rc = %d\n", + osd->od_svname, oid, rc); + goto failed; + } + + snprintf(key, sizeof(osd_oti_get(env)->oti_str), "%llx", oid); + rc = osd_zap_remove(osd, osd->od_unlinked->dn_object, + osd->od_unlinked, key, tx); + if (rc != 0) { + CWARN("%s: Cannot remove %llu from unlinked set: rc = %d\n", + osd->od_svname, oid, rc); + goto failed; + } + + rc = -dmu_object_free(osd->od_os, oid, tx); + if (rc != 0) { + CWARN("%s: Cannot free %llu: rc = %d\n", + osd->od_svname, oid, rc); + goto failed; + } + dmu_tx_commit(tx); + + return 0; + +failed: + LASSERT(rc != 0); + dmu_tx_abort(tx); + + return rc; +} + +static void +osd_unlinked_drain(const struct lu_env *env, struct osd_device *osd) +{ + zap_cursor_t zc; + zap_attribute_t *za = &osd_oti_get(env)->oti_za; + + zap_cursor_init(&zc, osd->od_os, osd->od_unlinked->dn_object); + + while (zap_cursor_retrieve(&zc, za) == 0) { + /* If cannot free the object, leave it in the unlinked set, + * until the OSD is mounted again when obd_unlinked_drain() + * will be called. */ + if (osd_unlinked_object_free(env, osd, za->za_first_integer)) + break; + zap_cursor_advance(&zc); + } + + zap_cursor_fini(&zc); +} + static int osd_mount(const struct lu_env *env, struct osd_device *o, struct lustre_cfg *cfg) { - char *dev = lustre_cfg_string(cfg, 1); - dmu_buf_t *rootdb; - int rc; + char *mntdev = lustre_cfg_string(cfg, 1); + char *str = lustre_cfg_string(cfg, 2); + char *svname = lustre_cfg_string(cfg, 4); + dnode_t *rootdn; + const char *opts; + int rc; ENTRY; - if (o->od_objset.os != NULL) + if (o->od_os != NULL) RETURN(0); - if (strlen(dev) >= sizeof(o->od_mntdev)) + if (mntdev == NULL || svname == NULL) + RETURN(-EINVAL); + + rc = strlcpy(o->od_mntdev, mntdev, sizeof(o->od_mntdev)); + if (rc >= sizeof(o->od_mntdev)) RETURN(-E2BIG); - strcpy(o->od_mntdev, dev); - strncpy(o->od_svname, lustre_cfg_string(cfg, 4), - sizeof(o->od_svname) - 1); + rc = strlcpy(o->od_svname, svname, sizeof(o->od_svname)); + if (rc >= sizeof(o->od_svname)) + RETURN(-E2BIG); - rc = -udmu_objset_open(o->od_mntdev, &o->od_objset); - if (rc) { - CERROR("can't open objset %s: %d\n", o->od_mntdev, rc); - RETURN(rc); + 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); + str = strstr(str, ":"); + if (str) { + unsigned long flags; + + rc = kstrtoul(str + 1, 10, &flags); + if (rc) + RETURN(-EINVAL); + + if (flags & LMD_FLG_DEV_RDONLY) { + o->od_dt_dev.dd_rdonly = 1; + LCONSOLE_WARN("%s: set dev_rdonly on this device\n", + svname); + } + + if (flags & LMD_FLG_NOSCRUB) + o->od_auto_scrub_interval = AS_NEVER; } - rc = __osd_obj2dbuf(env, o->od_objset.os, o->od_objset.root, - &rootdb, root_tag); - if (rc) { - CERROR("udmu_obj2dbuf() failed with error %d\n", rc); - udmu_objset_close(&o->od_objset); + if (server_name_is_ost(o->od_svname)) + o->od_is_ost = 1; + + rc = osd_objset_open(o); + if (rc) RETURN(rc); - } - o->od_root = rootdb->db_object; - sa_buf_rele(rootdb, root_tag); + o->od_xattr_in_sa = B_TRUE; + o->od_max_blksz = osd_spa_maxblocksize(o->od_os->os_spa); - /* 1. initialize oi before any file create or file open */ - rc = osd_oi_init(env, o); + rc = __osd_obj2dnode(o->od_os, o->od_rootid, &rootdn); if (rc) GOTO(err, rc); + o->od_root = rootdn->dn_object; + osd_dnode_rele(rootdn); + + rc = __osd_obj2dnode(o->od_os, DMU_USERUSED_OBJECT, + &o->od_userused_dn); + if (rc) + GOTO(err, rc); + + rc = __osd_obj2dnode(o->od_os, DMU_GROUPUSED_OBJECT, + &o->od_groupused_dn); + if (rc) + GOTO(err, rc); + +#ifdef ZFS_PROJINHERIT + if (dmu_objset_projectquota_enabled(o->od_os)) { + rc = __osd_obj2dnode(o->od_os, DMU_PROJECTUSED_OBJECT, + &o->od_projectused_dn); + if (rc && rc != -ENOENT) + GOTO(err, rc); + } +#endif rc = lu_site_init(&o->od_site, osd2lu_dev(o)); if (rc) GOTO(err, rc); + o->od_site.ls_bottom_dev = osd2lu_dev(o); rc = lu_site_init_finish(&o->od_site); if (rc) GOTO(err, rc); - /* Use our own ZAP for inode accounting by default, this can be changed - * via procfs to estimate the inode usage from the block usage */ - o->od_quota_iused_est = 0; + rc = osd_objset_register_callbacks(o); + if (rc) + GOTO(err, rc); + + o->od_in_init = 1; + rc = osd_scrub_setup(env, o); + o->od_in_init = 0; + if (rc) + GOTO(err, rc); rc = osd_procfs_init(o, o->od_svname); if (rc) GOTO(err, rc); - o->arc_prune_cb = arc_add_prune_callback(arc_prune_func, o); + /* initialize quota slave instance */ + o->od_quota_slave = qsd_init(env, o->od_svname, &o->od_dt_dev, + o->od_proc_entry); + if (IS_ERR(o->od_quota_slave)) { + rc = PTR_ERR(o->od_quota_slave); + o->od_quota_slave = NULL; + GOTO(err, rc); + } +#ifdef HAVE_DMU_USEROBJ_ACCOUNTING + if (!osd_dmu_userobj_accounting_available(o)) + CWARN("%s: dnode accounting not enabled: " + "enable feature@userobj_accounting in pool\n", + o->od_mntdev); +#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; + + osd_unlinked_drain(env, o); err: + if (rc && o->od_os) { + osd_dmu_objset_disown(o->od_os, B_FALSE, o); + o->od_os = NULL; + } + RETURN(rc); } @@ -571,18 +1173,45 @@ static void osd_umount(const struct lu_env *env, struct osd_device *o) { ENTRY; - if (cfs_atomic_read(&o->od_zerocopy_alloc)) + if (atomic_read(&o->od_zerocopy_alloc)) CERROR("%s: lost %d allocated page(s)\n", o->od_svname, - cfs_atomic_read(&o->od_zerocopy_alloc)); - if (cfs_atomic_read(&o->od_zerocopy_loan)) + atomic_read(&o->od_zerocopy_alloc)); + if (atomic_read(&o->od_zerocopy_loan)) CERROR("%s: lost %d loaned abuf(s)\n", o->od_svname, - cfs_atomic_read(&o->od_zerocopy_loan)); - if (cfs_atomic_read(&o->od_zerocopy_pin)) + atomic_read(&o->od_zerocopy_loan)); + if (atomic_read(&o->od_zerocopy_pin)) CERROR("%s: lost %d pinned dbuf(s)\n", o->od_svname, - cfs_atomic_read(&o->od_zerocopy_pin)); + atomic_read(&o->od_zerocopy_pin)); - if (o->od_objset.os != NULL) - udmu_objset_close(&o->od_objset); + if (o->od_unlinked) { + osd_dnode_rele(o->od_unlinked); + o->od_unlinked = NULL; + } + if (o->od_userused_dn) { + osd_dnode_rele(o->od_userused_dn); + o->od_userused_dn = NULL; + } + if (o->od_groupused_dn) { + osd_dnode_rele(o->od_groupused_dn); + o->od_groupused_dn = NULL; + } + +#ifdef ZFS_PROJINHERIT + if (o->od_projectused_dn) { + osd_dnode_rele(o->od_projectused_dn); + o->od_projectused_dn = NULL; + } +#endif + + if (o->od_os != NULL) { + if (!o->od_dt_dev.dd_rdonly) + /* force a txg sync to get all commit callbacks */ + txg_wait_synced(dmu_objset_pool(o->od_os), 0ULL); + + /* close the object set */ + osd_dmu_objset_disown(o->od_os, B_FALSE, o); + o->od_os = NULL; + } EXIT; } @@ -601,10 +1230,9 @@ static int osd_device_init0(const struct lu_env *env, l->ld_ops = &osd_lu_ops; o->od_dt_dev.dd_ops = &osd_dt_ops; - - o->od_capa_hash = init_capa_hash(); - if (o->od_capa_hash == NULL) - GOTO(out, rc = -ENOMEM); + sema_init(&o->od_otable_sem, 1); + INIT_LIST_HEAD(&o->od_ios_list); + o->od_auto_scrub_interval = AS_DEFAULT; out: RETURN(rc); @@ -617,13 +1245,23 @@ static struct lu_device *osd_device_alloc(const struct lu_env *env, struct lu_device_type *type, struct lustre_cfg *cfg) { - struct osd_device *dev; - int rc; + struct osd_device *dev; + struct osd_seq_list *osl; + int rc; OBD_ALLOC_PTR(dev); if (dev == NULL) return ERR_PTR(-ENOMEM); + osl = &dev->od_seq_list; + INIT_LIST_HEAD(&osl->osl_seq_list); + rwlock_init(&osl->osl_seq_list_lock); + sema_init(&osl->osl_seq_init_sem, 1); + INIT_LIST_HEAD(&dev->od_index_backup_list); + INIT_LIST_HEAD(&dev->od_index_restore_list); + spin_lock_init(&dev->od_lock); + dev->od_index_backup_policy = LIBP_NONE; + rc = dt_device_init(&dev->od_dt_dev, type); if (rc == 0) { rc = osd_device_init0(env, dev, cfg); @@ -648,7 +1286,6 @@ static struct lu_device *osd_device_free(const struct lu_env *env, struct osd_device *o = osd_dev(d); ENTRY; - cleanup_capa_hash(o->od_capa_hash); /* 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); @@ -671,22 +1308,26 @@ static struct lu_device *osd_device_fini(const struct lu_env *env, ENTRY; - osd_oi_fini(env, o); - - if (o->od_objset.os) { - arc_remove_prune_callback(o->arc_prune_cb); - o->arc_prune_cb = NULL; - osd_sync(env, lu2dt_dev(d)); - txg_wait_callbacks(spa_get_dsl(dmu_objset_spa(o->od_objset.os))); + if (o->od_os) { + osd_objset_unregister_callbacks(o); + if (!o->od_dt_dev.dd_rdonly) { + osd_sync(env, lu2dt_dev(d)); + txg_wait_callbacks( + spa_get_dsl(dmu_objset_spa(o->od_os))); + } } + /* now with all the callbacks completed we can cleanup the remainings */ + osd_shutdown(env, o); + osd_scrub_cleanup(env, o); + rc = osd_procfs_fini(o); if (rc) { CERROR("proc fini error %d\n", rc); RETURN(ERR_PTR(rc)); } - if (o->od_objset.os) + if (o->od_os) osd_umount(env, o); RETURN(NULL); @@ -706,27 +1347,57 @@ static int osd_process_config(const struct lu_env *env, struct lu_device *d, struct lustre_cfg *cfg) { struct osd_device *o = osd_dev(d); - int err; + int rc; ENTRY; switch(cfg->lcfg_command) { case LCFG_SETUP: - err = osd_mount(env, o, cfg); + rc = osd_mount(env, o, cfg); break; case LCFG_CLEANUP: - err = osd_shutdown(env, o); + /* For the case LCFG_PRE_CLEANUP is not called in advance, + * that may happend if hit failure during mount process. */ + osd_index_backup(env, o, false); + rc = osd_shutdown(env, o); + break; + case LCFG_PARAM: { + LASSERT(&o->od_dt_dev); + rc = class_process_proc_param(PARAM_OSD, lprocfs_osd_obd_vars, + cfg, &o->od_dt_dev); + if (rc > 0 || rc == -ENOSYS) { + rc = class_process_proc_param(PARAM_OST, + lprocfs_osd_obd_vars, + cfg, &o->od_dt_dev); + if (rc > 0) + rc = 0; + } + break; + } + case LCFG_PRE_CLEANUP: + osd_index_backup(env, o, + o->od_index_backup_policy != LIBP_NONE); + rc = 0; break; default: - err = -ENOTTY; + rc = -ENOTTY; } - RETURN(err); + RETURN(rc); } static int osd_recovery_complete(const struct lu_env *env, struct lu_device *d) { + struct osd_device *osd = osd_dev(d); + int rc = 0; ENTRY; - RETURN(0); + + if (osd->od_quota_slave == NULL) + RETURN(0); + + /* start qsd instance on recovery completion, this notifies the quota + * slave code that we are about to process new requests now */ + rc = qsd_start(env, osd->od_quota_slave); + RETURN(rc); } /* @@ -749,9 +1420,9 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp, *exp = class_conn2export(&conn); - cfs_spin_lock(&osd->od_objset.lock); + spin_lock(&obd->obd_dev_lock); osd->od_connects++; - cfs_spin_unlock(&osd->od_objset.lock); + spin_unlock(&obd->obd_dev_lock); RETURN(0); } @@ -768,11 +1439,11 @@ static int osd_obd_disconnect(struct obd_export *exp) ENTRY; /* Only disconnect the underlying layers on the final disconnect. */ - cfs_spin_lock(&osd->od_objset.lock); + spin_lock(&obd->obd_dev_lock); osd->od_connects--; if (osd->od_connects == 0) release = 1; - cfs_spin_unlock(&osd->od_objset.lock); + spin_unlock(&obd->obd_dev_lock); rc = class_disconnect(exp); /* bz 9811 */ @@ -781,6 +1452,33 @@ static int osd_obd_disconnect(struct obd_export *exp) RETURN(rc); } +static int osd_fid_init(const struct lu_env *env, struct osd_device *osd) +{ + struct seq_server_site *ss = osd_seq_site(osd); + int rc; + ENTRY; + + if (osd->od_is_ost || osd->od_cl_seq != NULL) + RETURN(0); + + if (unlikely(ss == NULL)) + RETURN(-ENODEV); + + OBD_ALLOC_PTR(osd->od_cl_seq); + if (osd->od_cl_seq == NULL) + RETURN(-ENOMEM); + + rc = seq_client_init(osd->od_cl_seq, NULL, LUSTRE_SEQ_METADATA, + osd->od_svname, ss->ss_server_seq); + + if (rc != 0) { + OBD_FREE_PTR(osd->od_cl_seq); + osd->od_cl_seq = NULL; + } + + RETURN(rc); +} + static int osd_prepare(const struct lu_env *env, struct lu_device *pdev, struct lu_device *dev) { @@ -788,14 +1486,15 @@ static int osd_prepare(const struct lu_env *env, struct lu_device *pdev, int rc = 0; ENTRY; - /* initialize quota slave instance */ - osd->od_quota_slave = qsd_init(env, osd->od_svname, &osd->od_dt_dev, - osd->od_proc_entry); - if (IS_ERR(osd->od_quota_slave)) { - rc = PTR_ERR(osd->od_quota_slave); - osd->od_quota_slave = NULL; + if (osd->od_quota_slave != NULL) { + /* set up quota slave objects */ + rc = qsd_prepare(env, osd->od_quota_slave); + if (rc != 0) + RETURN(rc); } + rc = osd_fid_init(env, osd); + RETURN(rc); } @@ -814,6 +1513,14 @@ static void osd_type_stop(struct lu_device_type *t) { } +int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp, + struct lu_fid *fid, struct md_op_data *op_data) +{ + struct osd_device *osd = osd_dev(exp->exp_obd->obd_lu_dev); + + return seq_client_alloc_fid(env, osd->od_cl_seq, fid); +} + static struct lu_device_type_operations osd_device_type_ops = { .ldto_init = osd_type_init, .ldto_fini = osd_type_fini, @@ -839,10 +1546,11 @@ static struct lu_device_type osd_device_type = { static struct obd_ops osd_obd_device_ops = { .o_owner = THIS_MODULE, .o_connect = osd_obd_connect, - .o_disconnect = osd_obd_disconnect + .o_disconnect = osd_obd_disconnect, + .o_fid_alloc = osd_fid_alloc }; -int __init osd_init(void) +static int __init osd_init(void) { int rc; @@ -854,27 +1562,30 @@ int __init osd_init(void) if (rc) return rc; - rc = class_register_type(&osd_obd_device_ops, NULL, - lprocfs_osd_module_vars, + rc = class_register_type(&osd_obd_device_ops, NULL, true, NULL, LUSTRE_OSD_ZFS_NAME, &osd_device_type); if (rc) lu_kmem_fini(osd_caches); return rc; } -void __exit osd_exit(void) +static void __exit osd_exit(void) { class_unregister_type(LUSTRE_OSD_ZFS_NAME); lu_kmem_fini(osd_caches); } -extern unsigned int osd_oi_count; -CFS_MODULE_PARM(osd_oi_count, "i", int, 0444, - "Number of Object Index containers to be created, " - "it's only valid for new filesystem."); +module_param(osd_oi_count, int, 0444); +MODULE_PARM_DESC(osd_oi_count, "Number of Object Index containers to be created, it's only valid for new filesystem."); + +module_param(osd_txg_sync_delay_us, int, 0644); +MODULE_PARM_DESC(osd_txg_sync_delay_us, + "When zero or larger delay N usec instead of doing TXG sync"); -MODULE_AUTHOR("Sun Microsystems, Inc. "); +MODULE_AUTHOR("OpenSFS, Inc. "); MODULE_DESCRIPTION("Lustre Object Storage Device ("LUSTRE_OSD_ZFS_NAME")"); +MODULE_VERSION(LUSTRE_VERSION_STRING); MODULE_LICENSE("GPL"); -cfs_module(osd, LUSTRE_VERSION_STRING, osd_init, osd_exit); +module_init(osd_init); +module_exit(osd_exit);