X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ffld%2Ffld_handler.c;h=e40b61a6ebf769489a07587b487590271013bdde;hp=a7990884b3863c6665f2a9d670f8b3f95c30c27b;hb=3f3d6e175b891ddb063cd3b6a08ee1961aca72aa;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431 diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c index a799088..e40b61a 100644 --- a/lustre/fld/fld_handler.c +++ b/lustre/fld/fld_handler.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,241 +42,240 @@ * Author: Pravin Shelar */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_FLD -#ifdef __KERNEL__ -# include -# include -# include -# include -#else /* __KERNEL__ */ -# include -# include -#endif +#include +#include #include -#include -#include #include -#include - -#include #include +#include +#include #include +#include #include "fld_internal.h" -#include - -#ifdef __KERNEL__ /* context key constructor/destructor: fld_key_init, fld_key_fini */ LU_KEY_INIT_FINI(fld, struct fld_thread_info); /* context key: fld_thread_key */ -LU_CONTEXT_KEY_DEFINE(fld, LCT_MD_THREAD|LCT_DT_THREAD); - -cfs_proc_dir_entry_t *fld_type_proc_dir = NULL; - -static struct lu_local_obj_desc llod_fld_index = { - .llod_name = fld_index_name, - .llod_oid = FLD_INDEX_OID, - .llod_is_index = 1, - .llod_feat = &fld_index_features, -}; +/* MGS thread may create llog file causing FLD lookup */ +LU_CONTEXT_KEY_DEFINE(fld, LCT_MD_THREAD | LCT_DT_THREAD | LCT_MG_THREAD); -static int __init fld_mod_init(void) +int fld_server_mod_init(void) { - fld_type_proc_dir = lprocfs_register(LUSTRE_FLD_NAME, - proc_lustre_root, - NULL, NULL); - if (IS_ERR(fld_type_proc_dir)) - return PTR_ERR(fld_type_proc_dir); - - llo_local_obj_register(&llod_fld_index); + LU_CONTEXT_KEY_INIT(&fld_thread_key); + return lu_context_key_register(&fld_thread_key); +} - LU_CONTEXT_KEY_INIT(&fld_thread_key); - lu_context_key_register(&fld_thread_key); - return 0; +void fld_server_mod_exit(void) +{ + lu_context_key_degister(&fld_thread_key); } -static void __exit fld_mod_exit(void) +int fld_declare_server_create(const struct lu_env *env, + struct lu_server_fld *fld, + const struct lu_seq_range *range, + struct thandle *th) { - llo_local_obj_unregister(&llod_fld_index); - lu_context_key_degister(&fld_thread_key); - if (fld_type_proc_dir != NULL && !IS_ERR(fld_type_proc_dir)) { - lprocfs_remove(&fld_type_proc_dir); - fld_type_proc_dir = NULL; - } + int rc; + + rc = fld_declare_index_create(env, fld, range, th); + RETURN(rc); } +EXPORT_SYMBOL(fld_declare_server_create); /** * Insert FLD index entry and update FLD cache. * - * First it try to merge given range with existing range then update - * FLD index and FLD cache accordingly. FLD index consistency is maintained - * by this function. * This function is called from the sequence allocator when a super-sequence * is granted to a server. */ - -int fld_server_create(struct lu_server_fld *fld, - const struct lu_env *env, - struct lu_seq_range *add_range, - struct thandle *th) +int fld_server_create(const struct lu_env *env, struct lu_server_fld *fld, + const struct lu_seq_range *range, struct thandle *th) { - struct lu_seq_range *erange; - struct lu_seq_range *new; - struct fld_thread_info *info; - int rc = 0; - int do_merge=0; - - ENTRY; - - info = lu_context_key_get(&env->le_ctx, &fld_thread_key); - cfs_mutex_lock(&fld->lsf_lock); - - erange = &info->fti_lrange; - new = &info->fti_irange; - *new = *add_range; - - /* STEP 1: try to merge with previous range */ - rc = fld_index_lookup(fld, env, new->lsr_start, erange); - if (!rc) { - /* in case of range overlap, mdt ID must be same for both ranges */ - if (new->lsr_mdt != erange->lsr_mdt) { - CERROR("mdt[%x] for given range is different from" - "existing overlapping range mdt[%x]\n", - new->lsr_mdt, erange->lsr_mdt); - rc = -EIO; - GOTO(out, rc); - } - - if (new->lsr_end < erange->lsr_end) - GOTO(out, rc); - do_merge = 1; - - } else if (rc == -ENOENT) { - /* check for merge case: optimizes for single mds lustre. - * As entry does not exist, returned entry must be left side - * entry compared to start of new range (ref dio_lookup()). - * So try to merge from left. - */ - if (new->lsr_start == erange->lsr_end && - new->lsr_mdt == erange->lsr_mdt) - do_merge = 1; - } else { - /* no overlap allowed in fld, so failure in lookup is error */ - GOTO(out, rc); - } - - if (do_merge) { - /* new range can be combined with existing one. - * So delete existing range. - */ + int rc; - rc = fld_index_delete(fld, env, erange, th); - if (rc == 0) { - new->lsr_start = min(erange->lsr_start, new->lsr_start); - new->lsr_end = max(erange->lsr_end, new->lsr_end); - } else - GOTO(out, rc); + mutex_lock(&fld->lsf_lock); + rc = fld_index_create(env, fld, range, th); + mutex_unlock(&fld->lsf_lock); - do_merge = 0; - } - - /* STEP 2: try to merge with next range */ - rc = fld_index_lookup(fld, env, new->lsr_end, erange); - if (!rc) { - /* case range overlap: with right side entry. */ - if (new->lsr_mdt == erange->lsr_mdt) - do_merge = 1; - } else if (rc == -ENOENT) { - /* this range is left of new range end point */ - LASSERT(erange->lsr_end <= new->lsr_end); - - if (new->lsr_end == erange->lsr_end) - do_merge = 1; - if (new->lsr_start <= erange->lsr_start) - do_merge = 1; - } else - GOTO(out, rc); - - if (do_merge) { - if (new->lsr_mdt != erange->lsr_mdt) { - CERROR("mdt[%x] for given range is different from" - "existing overlapping range mdt[%x]\n", - new->lsr_mdt, erange->lsr_mdt); - rc = -EIO; - GOTO(out, rc); - } - - /* merge with next range */ - rc = fld_index_delete(fld, env, erange, th); - if (rc == 0) { - new->lsr_start = min(erange->lsr_start, new->lsr_start); - new->lsr_end = max(erange->lsr_end, new->lsr_end); - } else - GOTO(out, rc); - } + RETURN(rc); +} +EXPORT_SYMBOL(fld_server_create); - /* now update fld entry. */ - rc = fld_index_create(fld, env, new, th); +/** + * Extract index information from fld name like srv-fsname-MDT0000 + **/ +int fld_name_to_index(const char *name, __u32 *index) +{ + char *dash; + int rc; + ENTRY; + + CDEBUG(D_INFO, "get index from %s\n", name); + dash = strrchr(name, '-'); + if (dash == NULL) + RETURN(-EINVAL); + dash++; + rc = target_name2index(dash, index, NULL); + RETURN(rc); +} - LASSERT(rc != -EEXIST); +/** + * Retrieve fldb entry from MDT0 and add to local FLDB and cache. + **/ +int fld_update_from_controller(const struct lu_env *env, + struct lu_server_fld *fld) +{ + struct fld_thread_info *info; + struct lu_seq_range *range; + struct lu_seq_range_array *lsra; + __u32 index; + struct ptlrpc_request *req; + int rc; + int i; + ENTRY; + + /* Update only happens during initalization, i.e. local FLDB + * does not exist yet */ + if (!fld->lsf_new) + RETURN(0); + + rc = fld_name_to_index(fld->lsf_name, &index); + if (rc < 0) + RETURN(rc); + + /* No need update fldb for MDT0 */ + if (index == 0) + RETURN(0); + + info = lu_context_key_get(&env->le_ctx, &fld_thread_key); + LASSERT(info != NULL); + range = &info->fti_lrange; + memset(range, 0, sizeof(*range)); + range->lsr_index = index; + fld_range_set_mdt(range); + + do { + rc = fld_client_rpc(fld->lsf_control_exp, range, FLD_READ, + &req); + if (rc != 0 && rc != -EAGAIN) + GOTO(out, rc); + + LASSERT(req != NULL); + lsra = (struct lu_seq_range_array *)req_capsule_server_get( + &req->rq_pill, &RMF_GENERIC_DATA); + if (lsra == NULL) + GOTO(out, rc = -EPROTO); + + range_array_le_to_cpu(lsra, lsra); + for (i = 0; i < lsra->lsra_count; i++) { + int rc1; + + if (lsra->lsra_lsr[i].lsr_flags != LU_SEQ_RANGE_MDT) + GOTO(out, rc = -EINVAL); + + if (lsra->lsra_lsr[i].lsr_index != index) + GOTO(out, rc = -EINVAL); + + rc1 = fld_insert_entry(env, fld, &lsra->lsra_lsr[i]); + if (rc1 != 0) + GOTO(out, rc = rc1); + } + if (rc == -EAGAIN) + *range = lsra->lsra_lsr[lsra->lsra_count - 1]; + } while (rc == -EAGAIN); + + fld->lsf_new = 1; out: - if (rc == 0) - fld_cache_insert(fld->lsf_cache, new); - - cfs_mutex_unlock(&fld->lsf_lock); + if (req != NULL) + ptlrpc_req_finished(req); - CDEBUG((rc != 0 ? D_ERROR : D_INFO), - "%s: FLD create: given range : "DRANGE - "after merge "DRANGE" rc = %d \n", fld->lsf_name, - PRANGE(add_range), PRANGE(new), rc); - - RETURN(rc); + RETURN(rc); } +EXPORT_SYMBOL(fld_update_from_controller); -EXPORT_SYMBOL(fld_server_create); +/** + * Lookup sequece in local cache/fldb. + **/ +int fld_local_lookup(const struct lu_env *env, struct lu_server_fld *fld, + seqno_t seq, struct lu_seq_range *range) +{ + struct lu_seq_range *erange; + struct fld_thread_info *info; + int rc; + ENTRY; + + info = lu_context_key_get(&env->le_ctx, &fld_thread_key); + LASSERT(info != NULL); + erange = &info->fti_lrange; + + /* Lookup it in the cache. */ + rc = fld_cache_lookup(fld->lsf_cache, seq, erange); + if (rc == 0) { + if (unlikely(fld_range_type(erange) != fld_range_type(range) && + !fld_range_is_any(range))) { + CERROR("%s: FLD cache range "DRANGE" does not match" + "requested flag %x: rc = %d\n", fld->lsf_name, + PRANGE(erange), range->lsr_flags, -EIO); + RETURN(-EIO); + } + *range = *erange; + RETURN(0); + } + RETURN(rc); +} +EXPORT_SYMBOL(fld_local_lookup); /** - * Lookup mds by seq, returns a range for given seq. + * Lookup MDT/OST by seq, returns a range for given seq. * * If that entry is not cached in fld cache, request is sent to super * sequence controller node (MDT0). All other MDT[1...N] and client * cache fld entries, but this cache is not persistent. */ - -int fld_server_lookup(struct lu_server_fld *fld, - const struct lu_env *env, - seqno_t seq, struct lu_seq_range *range) +int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld, + seqno_t seq, struct lu_seq_range *range) { - int rc; - ENTRY; - - /* Lookup it in the cache. */ - rc = fld_cache_lookup(fld->lsf_cache, seq, range); - if (rc == 0) - RETURN(0); - - if (fld->lsf_obj) - rc = fld_index_lookup(fld, env, seq, range); - else { - LASSERT(fld->lsf_control_exp); - /* send request to mdt0 i.e. super seq. controller. - * This is temporary solution, long term solution is fld - * replication on all mdt servers. - */ - rc = fld_client_rpc(fld->lsf_control_exp, - range, FLD_LOOKUP); - } - - if (rc == 0) - fld_cache_insert(fld->lsf_cache, range); - - RETURN(rc); + __u32 index; + int rc; + ENTRY; + + rc = fld_local_lookup(env, fld, seq, range); + if (likely(rc == 0)) + RETURN(rc); + + rc = fld_name_to_index(fld->lsf_name, &index); + if (rc < 0) + RETURN(rc); + else + rc = 0; + + if (index == 0) { + /* On server side, all entries should be in cache. + * If we can not find it in cache, just return error */ + CERROR("%s: Cannot find sequence "LPX64": rc = %d\n", + fld->lsf_name, seq, -EIO); + RETURN(-EIO); + } else { + if (fld->lsf_control_exp == NULL) { + CERROR("%s: lookup "LPX64", but not connects to MDT0" + "yet: rc = %d.\n", fld->lsf_name, seq, -EIO); + RETURN(-EIO); + } + /* send request to mdt0 i.e. super seq. controller. + * This is temporary solution, long term solution is fld + * replication on all mdt servers. + */ + range->lsr_start = seq; + rc = fld_client_rpc(fld->lsf_control_exp, + range, FLD_QUERY, NULL); + if (rc == 0) + fld_cache_insert(fld->lsf_cache, range); + } + RETURN(rc); } EXPORT_SYMBOL(fld_server_lookup); @@ -284,108 +283,82 @@ EXPORT_SYMBOL(fld_server_lookup); * All MDT server handle fld lookup operation. But only MDT0 has fld index. * if entry is not found in cache we need to forward lookup request to MDT0 */ - -static int fld_server_handle(struct lu_server_fld *fld, - const struct lu_env *env, - __u32 opc, struct lu_seq_range *range, - struct fld_thread_info *info) +static int fld_handle_lookup(struct tgt_session_info *tsi) { - int rc; - ENTRY; + struct obd_export *exp = tsi->tsi_exp; + struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site; + struct lu_server_fld *fld; + struct lu_seq_range *in; + struct lu_seq_range *out; + int rc; - switch (opc) { - case FLD_LOOKUP: - rc = fld_server_lookup(fld, env, - range->lsr_start, range); - break; - default: - rc = -EINVAL; - break; - } + ENTRY; - CDEBUG(D_INFO, "%s: FLD req handle: error %d (opc: %d, range: " - DRANGE"\n", fld->lsf_name, rc, opc, PRANGE(range)); - - RETURN(rc); + in = req_capsule_client_get(tsi->tsi_pill, &RMF_FLD_MDFLD); + if (in == NULL) + RETURN(err_serious(-EPROTO)); -} + rc = req_capsule_server_pack(tsi->tsi_pill); + if (unlikely(rc != 0)) + RETURN(err_serious(rc)); -static int fld_req_handle(struct ptlrpc_request *req, - struct fld_thread_info *info) -{ - struct lu_site *site; - struct lu_seq_range *in; - struct lu_seq_range *out; - int rc; - __u32 *opc; - ENTRY; + out = req_capsule_server_get(tsi->tsi_pill, &RMF_FLD_MDFLD); + if (out == NULL) + RETURN(err_serious(-EPROTO)); + *out = *in; - site = req->rq_export->exp_obd->obd_lu_dev->ld_site; - - rc = req_capsule_server_pack(info->fti_pill); - if (rc) - RETURN(err_serious(rc)); - - opc = req_capsule_client_get(info->fti_pill, &RMF_FLD_OPC); - if (opc != NULL) { - in = req_capsule_client_get(info->fti_pill, &RMF_FLD_MDFLD); - if (in == NULL) - RETURN(err_serious(-EPROTO)); - out = req_capsule_server_get(info->fti_pill, &RMF_FLD_MDFLD); - if (out == NULL) - RETURN(err_serious(-EPROTO)); - *out = *in; - - rc = fld_server_handle(lu_site2md(site)->ms_server_fld, - req->rq_svc_thread->t_env, - *opc, out, info); - } else - rc = err_serious(-EPROTO); - - RETURN(rc); -} + fld = lu_site2seq(site)->ss_server_fld; -static void fld_thread_info_init(struct ptlrpc_request *req, - struct fld_thread_info *info) -{ - info->fti_pill = &req->rq_pill; - /* Init request capsule. */ - req_capsule_init(info->fti_pill, req, RCL_SERVER); - req_capsule_set(info->fti_pill, &RQF_FLD_QUERY); -} + rc = fld_server_lookup(tsi->tsi_env, fld, in->lsr_start, out); -static void fld_thread_info_fini(struct fld_thread_info *info) -{ - req_capsule_fini(info->fti_pill); + CDEBUG(D_INFO, "%s: FLD req handle: error %d (range: "DRANGE")\n", + fld->lsf_name, rc, PRANGE(out)); + + RETURN(rc); } -static int fld_handle(struct ptlrpc_request *req) +static int fld_handle_read(struct tgt_session_info *tsi) { - struct fld_thread_info *info; - const struct lu_env *env; - int rc; + struct obd_export *exp = tsi->tsi_exp; + struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site; + struct lu_seq_range *in; + void *data; + int rc; - env = req->rq_svc_thread->t_env; - LASSERT(env != NULL); + ENTRY; - info = lu_context_key_get(&env->le_ctx, &fld_thread_key); - LASSERT(info != NULL); + req_capsule_set(tsi->tsi_pill, &RQF_FLD_READ); - fld_thread_info_init(req, info); - rc = fld_req_handle(req, info); - fld_thread_info_fini(info); + in = req_capsule_client_get(tsi->tsi_pill, &RMF_FLD_MDFLD); + if (in == NULL) + RETURN(err_serious(-EPROTO)); - return rc; + req_capsule_set_size(tsi->tsi_pill, &RMF_GENERIC_DATA, RCL_SERVER, + PAGE_CACHE_SIZE); + + rc = req_capsule_server_pack(tsi->tsi_pill); + if (unlikely(rc != 0)) + RETURN(err_serious(rc)); + + data = req_capsule_server_get(tsi->tsi_pill, &RMF_GENERIC_DATA); + + rc = fld_server_read(tsi->tsi_env, lu_site2seq(site)->ss_server_fld, + in, data, PAGE_CACHE_SIZE); + RETURN(rc); } -/* - * Entry point for handling FLD RPCs called from MDT. - */ -int fld_query(struct com_thread_info *info) +static int fld_handle_query(struct tgt_session_info *tsi) { - return fld_handle(info->cti_pill->rc_req); + int rc; + + ENTRY; + + req_capsule_set(tsi->tsi_pill, &RQF_FLD_QUERY); + + rc = fld_handle_lookup(tsi); + + RETURN(rc); } -EXPORT_SYMBOL(fld_query); /* * Returns true, if fid is local to this server node. @@ -398,26 +371,26 @@ EXPORT_SYMBOL(fld_query); int fid_is_local(const struct lu_env *env, struct lu_site *site, const struct lu_fid *fid) { - int result; - struct md_site *msite; - struct lu_seq_range *range; - struct fld_thread_info *info; - ENTRY; - - info = lu_context_key_get(&env->le_ctx, &fld_thread_key); - range = &info->fti_lrange; - - result = 1; /* conservatively assume fid is local */ - msite = lu_site2md(site); - if (msite->ms_client_fld != NULL) { - int rc; - - rc = fld_cache_lookup(msite->ms_client_fld->lcf_cache, - fid_seq(fid), range); - if (rc == 0) - result = (range->lsr_mdt == msite->ms_node_id); - } - return result; + int result; + struct seq_server_site *ss_site; + struct lu_seq_range *range; + struct fld_thread_info *info; + ENTRY; + + info = lu_context_key_get(&env->le_ctx, &fld_thread_key); + range = &info->fti_lrange; + + result = 1; /* conservatively assume fid is local */ + ss_site = lu_site2seq(site); + if (ss_site->ss_client_fld != NULL) { + int rc; + + rc = fld_cache_lookup(ss_site->ss_client_fld->lcf_cache, + fid_seq(fid), range); + if (rc == 0) + result = (range->lsr_index == ss_site->ss_node_id); + } + return result; } EXPORT_SYMBOL(fid_is_local); @@ -429,15 +402,22 @@ static int fld_server_proc_init(struct lu_server_fld *fld) int rc = 0; ENTRY; - fld->lsf_proc_dir = lprocfs_register(fld->lsf_name, - fld_type_proc_dir, - fld_server_proc_list, fld); - if (IS_ERR(fld->lsf_proc_dir)) { - rc = PTR_ERR(fld->lsf_proc_dir); - RETURN(rc); - } - - RETURN(rc); + fld->lsf_proc_dir = lprocfs_seq_register(fld->lsf_name, + fld_type_proc_dir, + fld_server_proc_list, fld); + if (IS_ERR(fld->lsf_proc_dir)) { + rc = PTR_ERR(fld->lsf_proc_dir); + RETURN(rc); + } + + rc = lprocfs_seq_create(fld->lsf_proc_dir, "fldb", 0444, + &fld_proc_seq_fops, fld); + if (rc) { + lprocfs_remove(&fld->lsf_proc_dir); + fld->lsf_proc_dir = NULL; + } + + RETURN(rc); } static void fld_server_proc_fini(struct lu_server_fld *fld) @@ -462,81 +442,67 @@ static void fld_server_proc_fini(struct lu_server_fld *fld) } #endif -int fld_server_init(struct lu_server_fld *fld, struct dt_device *dt, - const char *prefix, const struct lu_env *env, - int mds_node_id) +int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld, + struct dt_device *dt, const char *prefix, int type) { - int cache_size, cache_threshold; - struct lu_seq_range range; - int rc; - ENTRY; + int cache_size, cache_threshold; + int rc; - snprintf(fld->lsf_name, sizeof(fld->lsf_name), - "srv-%s", prefix); + ENTRY; - cache_size = FLD_SERVER_CACHE_SIZE / - sizeof(struct fld_cache_entry); + snprintf(fld->lsf_name, sizeof(fld->lsf_name), "srv-%s", prefix); - cache_threshold = cache_size * - FLD_SERVER_CACHE_THRESHOLD / 100; + cache_size = FLD_SERVER_CACHE_SIZE / sizeof(struct fld_cache_entry); - cfs_mutex_init(&fld->lsf_lock); - fld->lsf_cache = fld_cache_init(fld->lsf_name, - cache_size, cache_threshold); - if (IS_ERR(fld->lsf_cache)) { - rc = PTR_ERR(fld->lsf_cache); - fld->lsf_cache = NULL; - GOTO(out, rc); - } + cache_threshold = cache_size * FLD_SERVER_CACHE_THRESHOLD / 100; - if (!mds_node_id) { - rc = fld_index_init(fld, env, dt); - if (rc) - GOTO(out, rc); - } else - fld->lsf_obj = NULL; + mutex_init(&fld->lsf_lock); + fld->lsf_cache = fld_cache_init(fld->lsf_name, cache_size, + cache_threshold); + if (IS_ERR(fld->lsf_cache)) { + rc = PTR_ERR(fld->lsf_cache); + fld->lsf_cache = NULL; + RETURN(rc); + } - rc = fld_server_proc_init(fld); - if (rc) - GOTO(out, rc); + rc = fld_index_init(env, fld, dt); + if (rc) + GOTO(out_cache, rc); - fld->lsf_control_exp = NULL; + rc = fld_server_proc_init(fld); + if (rc) + GOTO(out_index, rc); - /* Insert reserved sequence number of ".lustre" into fld cache. */ - range.lsr_start = LU_DOT_LUSTRE_SEQ; - range.lsr_end = LU_DOT_LUSTRE_SEQ + 1; - range.lsr_mdt = 0; - fld_cache_insert(fld->lsf_cache, &range); + fld->lsf_control_exp = NULL; - EXIT; -out: - if (rc) - fld_server_fini(fld, env); - return rc; + RETURN(0); +out_index: + fld_index_fini(env, fld); +out_cache: + fld_cache_fini(fld->lsf_cache); + return rc; } EXPORT_SYMBOL(fld_server_init); -void fld_server_fini(struct lu_server_fld *fld, - const struct lu_env *env) +void fld_server_fini(const struct lu_env *env, struct lu_server_fld *fld) { - ENTRY; + ENTRY; - fld_server_proc_fini(fld); - fld_index_fini(fld, env); + fld_server_proc_fini(fld); + fld_index_fini(env, fld); - if (fld->lsf_cache != NULL) { - if (!IS_ERR(fld->lsf_cache)) - fld_cache_fini(fld->lsf_cache); - fld->lsf_cache = NULL; - } + if (fld->lsf_cache != NULL) { + if (!IS_ERR(fld->lsf_cache)) + fld_cache_fini(fld->lsf_cache); + fld->lsf_cache = NULL; + } - EXIT; + EXIT; } EXPORT_SYMBOL(fld_server_fini); -MODULE_AUTHOR("Sun Microsystems, Inc. "); -MODULE_DESCRIPTION("Lustre FLD"); -MODULE_LICENSE("GPL"); - -cfs_module(mdd, "0.1.0", fld_mod_init, fld_mod_exit); -#endif +struct tgt_handler fld_handlers[] = { +TGT_FLD_HDL_VAR(0, FLD_QUERY, fld_handle_query), +TGT_FLD_HDL_VAR(0, FLD_READ, fld_handle_read), +}; +EXPORT_SYMBOL(fld_handlers);