X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_nids.c;h=df792fc7cb299ce6dc295cb673a80e2abbc7c544;hb=273255103bfd88d5129ffd2a3c009b54a2300b4b;hp=794ee9e3780d6ce43f9b9c9a7878d83756bdc3bf;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_nids.c b/lustre/mgs/mgs_nids.c index 794ee9e..df792fc 100644 --- a/lustre/mgs/mgs_nids.c +++ b/lustre/mgs/mgs_nids.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,21 +44,13 @@ #define D_MGS D_CONFIG #ifdef __KERNEL__ -#include #include -#include #endif #include -#include #include -#include -#include -#include -#include -#include #include -#include + #include "mgs_internal.h" static unsigned int ir_timeout; @@ -68,7 +60,7 @@ static int nidtbl_is_sane(struct mgs_nidtbl *tbl) struct mgs_nidtbl_target *tgt; int version = 0; - LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); + LASSERT(mutex_is_locked(&tbl->mn_lock)); cfs_list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { if (!tgt->mnt_version) continue; @@ -86,7 +78,7 @@ static int nidtbl_is_sane(struct mgs_nidtbl *tbl) * nidtbl entries will be packed in @pages by @unit_size units - entries * shouldn't cross unit boundaries. */ -static int mgs_nidtbl_read(struct obd_device *unused, struct mgs_nidtbl *tbl, +static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, struct mgs_config_res *res, cfs_page_t **pages, int nrpages, int units_total, int unit_size) { @@ -107,7 +99,7 @@ static int mgs_nidtbl_read(struct obd_device *unused, struct mgs_nidtbl *tbl, LASSERT((unit_size & (unit_size - 1)) == 0); LASSERT(nrpages << CFS_PAGE_SHIFT >= units_total * unit_size); - cfs_mutex_lock(&tbl->mn_lock); + mutex_lock(&tbl->mn_lock); LASSERT(nidtbl_is_sane(tbl)); /* no more entries ? */ @@ -146,10 +138,16 @@ static int mgs_nidtbl_read(struct obd_device *unused, struct mgs_nidtbl *tbl, /* check if we need to consume remaining bytes. */ if (last_in_unit != NULL && bytes_in_unit) { - /* entry has been swapped. */ - __swab32s(&last_in_unit->mne_length); - last_in_unit->mne_length += bytes_in_unit; - __swab32s(&last_in_unit->mne_length); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0) + /* May need to swab back to update the length.*/ + if (exp->exp_need_mne_swab) + lustre_swab_mgs_nidtbl_entry(last_in_unit); +#endif + last_in_unit->mne_length += bytes_in_unit; +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0) + if (exp->exp_need_mne_swab) + lustre_swab_mgs_nidtbl_entry(last_in_unit); +#endif rc += bytes_in_unit; buf += bytes_in_unit; last_in_unit = NULL; @@ -195,7 +193,12 @@ static int mgs_nidtbl_read(struct obd_device *unused, struct mgs_nidtbl *tbl, entry->mne_nid_count = mti->mti_nid_count; memcpy(entry->u.nids, mti->mti_nids, mti->mti_nid_count * sizeof(lnet_nid_t)); - lustre_swab_mgs_nidtbl_entry(entry); + +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0) + /* For LU-1644, swab entry for 2.2 clients. */ + if (exp->exp_need_mne_swab) + lustre_swab_mgs_nidtbl_entry(entry); +#endif version = tgt->mnt_version; rc += entry_len; @@ -214,7 +217,7 @@ out: LASSERT(version <= tbl->mn_version); res->mcr_size = tbl->mn_version; res->mcr_offset = nobuf ? version : tbl->mn_version; - cfs_mutex_unlock(&tbl->mn_lock); + mutex_unlock(&tbl->mn_lock); LASSERT(ergo(version == 1, rc == 0)); /* get the log first time */ CDEBUG(D_MGS, "Read IR logs %s return with %d, version %llu\n", @@ -222,81 +225,102 @@ out: RETURN(rc); } -static int nidtbl_update_version(struct obd_device *obd, struct mgs_nidtbl *tbl) +static int nidtbl_update_version(const struct lu_env *env, + struct mgs_device *mgs, + struct mgs_nidtbl *tbl) { - struct lvfs_run_ctxt saved; - struct file *file = NULL; - char filename[sizeof(MGS_NIDTBL_DIR) + 9]; - u64 version; - loff_t off = 0; - int rc; + struct dt_object *fsdb; + struct thandle *th; + u64 version; + struct lu_buf buf = { + .lb_buf = &version, + .lb_len = sizeof(version) + }; + loff_t off = 0; + int rc; ENTRY; - LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); - LASSERT(sizeof(filename) < 32); + LASSERT(mutex_is_locked(&tbl->mn_lock)); - sprintf(filename, "%s/%s", - MGS_NIDTBL_DIR, tbl->mn_fsdb->fsdb_name); + fsdb = local_file_find_or_create(env, mgs->mgs_los, mgs->mgs_nidtbl_dir, + tbl->mn_fsdb->fsdb_name, + S_IFREG | S_IRUGO | S_IWUSR); + if (IS_ERR(fsdb)) + RETURN(PTR_ERR(fsdb)); - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + th = dt_trans_create(env, mgs->mgs_bottom); + if (IS_ERR(th)) + GOTO(out_put, rc = PTR_ERR(th)); - file = l_filp_open(filename, O_RDWR|O_CREAT, 0660); - if (!IS_ERR(file)) { - version = cpu_to_le64(tbl->mn_version); - rc = lustre_fwrite(file, &version, sizeof(version), &off); - if (rc == sizeof(version)) - rc = 0; - filp_close(file, 0); - fsfilt_sync(obd, obd->u.mgs.mgs_sb); - } else { - rc = PTR_ERR(file); - } + th->th_sync = 1; /* update table synchronously */ + rc = dt_declare_record_write(env, fsdb, buf.lb_len, off, th); + if (rc) + GOTO(out, rc); - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - RETURN(rc); + rc = dt_trans_start_local(env, mgs->mgs_bottom, th); + if (rc) + GOTO(out, rc); + + version = cpu_to_le64(tbl->mn_version); + rc = dt_record_write(env, fsdb, &buf, &off, th); + +out: + dt_trans_stop(env, mgs->mgs_bottom, th); +out_put: + lu_object_put(env, &fsdb->do_lu); + RETURN(rc); } #define MGS_NIDTBL_VERSION_INIT 2 -static int nidtbl_read_version(struct obd_device *obd, struct mgs_nidtbl *tbl) +static int nidtbl_read_version(const struct lu_env *env, + struct mgs_device *mgs, struct mgs_nidtbl *tbl, + u64 *version) { - struct lvfs_run_ctxt saved; - struct file *file = NULL; - char filename[sizeof(MGS_NIDTBL_DIR) + 9]; - u64 version; + struct dt_object *fsdb; + struct lu_fid fid; + u64 tmpver; + struct lu_buf buf = { + .lb_buf = &tmpver, + .lb_len = sizeof(tmpver) + }; loff_t off = 0; int rc; ENTRY; - LASSERT(cfs_mutex_is_locked(&tbl->mn_lock)); - LASSERT(sizeof(filename) < 32); - - sprintf(filename, "%s/%s", - MGS_NIDTBL_DIR, tbl->mn_fsdb->fsdb_name); - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - file = l_filp_open(filename, O_RDONLY, 0); - if (!IS_ERR(file)) { - rc = lustre_fread(file, &version, sizeof(version), &off); - if (rc == sizeof(version)) - rc = cpu_to_le64(version); - else if (rc == 0) - rc = MGS_NIDTBL_VERSION_INIT; - else - CERROR("read version file %s error %d\n", filename, rc); - filp_close(file, 0); - } else { - rc = PTR_ERR(file); - if (rc == -ENOENT) - rc = MGS_NIDTBL_VERSION_INIT; - } - - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - RETURN(rc); + LASSERT(mutex_is_locked(&tbl->mn_lock)); + + LASSERT(mgs->mgs_nidtbl_dir); + rc = dt_lookup_dir(env, mgs->mgs_nidtbl_dir, tbl->mn_fsdb->fsdb_name, + &fid); + if (rc == -ENOENT) { + *version = MGS_NIDTBL_VERSION_INIT; + RETURN(0); + } else if (rc < 0) { + RETURN(rc); + } + + fsdb = dt_locate_at(env, mgs->mgs_bottom, &fid, + &mgs->mgs_dt_dev.dd_lu_dev); + if (IS_ERR(fsdb)) + RETURN(PTR_ERR(fsdb)); + + rc = dt_read(env, fsdb, &buf, &off); + if (rc == buf.lb_len) { + *version = le64_to_cpu(tmpver); + rc = 0; + } else if (rc == 0) { + *version = MGS_NIDTBL_VERSION_INIT; + } else { + CERROR("%s: read version file %s error %d\n", + mgs->mgs_obd->obd_name, tbl->mn_fsdb->fsdb_name, rc); + } + lu_object_put(env, &fsdb->do_lu); + RETURN(rc); } -static int mgs_nidtbl_write(struct fs_db *fsdb, struct mgs_target_info *mti) +static int mgs_nidtbl_write(const struct lu_env *env, struct fs_db *fsdb, + struct mgs_target_info *mti) { struct mgs_nidtbl *tbl; struct mgs_nidtbl_target *tgt; @@ -309,7 +333,7 @@ static int mgs_nidtbl_write(struct fs_db *fsdb, struct mgs_target_info *mti) LASSERT(type != 0); tbl = &fsdb->fsdb_nidtbl; - cfs_mutex_lock(&tbl->mn_lock); + mutex_lock(&tbl->mn_lock); cfs_list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { struct mgs_target_info *info = &tgt->mnt_mti; if (type == tgt->mnt_type && @@ -336,11 +360,11 @@ static int mgs_nidtbl_write(struct fs_db *fsdb, struct mgs_target_info *mti) cfs_list_move_tail(&tgt->mnt_list, &tbl->mn_targets); - rc = nidtbl_update_version(fsdb->fsdb_obd, tbl); + rc = nidtbl_update_version(env, fsdb->fsdb_mgs, tbl); EXIT; out: - cfs_mutex_unlock(&tbl->mn_lock); + mutex_unlock(&tbl->mn_lock); if (rc) CERROR("Write NID table version for file system %s error %d\n", fsdb->fsdb_name, rc); @@ -352,10 +376,10 @@ static void mgs_nidtbl_fini_fs(struct fs_db *fsdb) struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; CFS_LIST_HEAD(head); - cfs_mutex_lock(&tbl->mn_lock); + mutex_lock(&tbl->mn_lock); tbl->mn_nr_targets = 0; cfs_list_splice_init(&tbl->mn_targets, &head); - cfs_mutex_unlock(&tbl->mn_lock); + mutex_unlock(&tbl->mn_lock); while (!cfs_list_empty(&head)) { struct mgs_nidtbl_target *tgt; @@ -365,20 +389,26 @@ static void mgs_nidtbl_fini_fs(struct fs_db *fsdb) } } -static int mgs_nidtbl_init_fs(struct fs_db *fsdb) +static int mgs_nidtbl_init_fs(const struct lu_env *env, struct fs_db *fsdb) { struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; + int rc; CFS_INIT_LIST_HEAD(&tbl->mn_targets); - cfs_mutex_init(&tbl->mn_lock); + mutex_init(&tbl->mn_lock); tbl->mn_nr_targets = 0; tbl->mn_fsdb = fsdb; - cfs_mutex_lock(&tbl->mn_lock); - tbl->mn_version = nidtbl_read_version(fsdb->fsdb_obd, tbl); - cfs_mutex_unlock(&tbl->mn_lock); - CDEBUG(D_MGS, "IR: current version is %llu\n", tbl->mn_version); - - return 0; + mutex_lock(&tbl->mn_lock); + rc = nidtbl_read_version(env, fsdb->fsdb_mgs, tbl, &tbl->mn_version); + mutex_unlock(&tbl->mn_lock); + if (rc < 0) + CERROR("%s: IR: failed to read current version, rc = %d\n", + fsdb->fsdb_mgs->mgs_obd->obd_name, rc); + else + CDEBUG(D_MGS, "IR: current version is %llu\n", + tbl->mn_version); + + return rc; } /* --------- Imperative Recovery relies on nidtbl stuff ------- */ @@ -412,7 +442,7 @@ static int mgs_ir_notify(void *arg) sprintf(name, "mgs_%s_notify", fsdb->fsdb_name); cfs_daemonize(name); - cfs_complete(&fsdb->fsdb_notify_comp); + complete(&fsdb->fsdb_notify_comp); set_user_nice(current, -2); @@ -431,16 +461,16 @@ static int mgs_ir_notify(void *arg) name, cfs_atomic_read(&fsdb->fsdb_notify_phase)); fsdb->fsdb_notify_start = cfs_time_current(); - mgs_revoke_lock(fsdb->fsdb_obd, fsdb, CONFIG_T_RECOVER); + mgs_revoke_lock(fsdb->fsdb_mgs, fsdb, CONFIG_T_RECOVER); } - cfs_complete(&fsdb->fsdb_notify_comp); + complete(&fsdb->fsdb_notify_comp); return 0; } -int mgs_ir_init_fs(struct obd_device *obd, struct fs_db *fsdb) +int mgs_ir_init_fs(const struct lu_env *env, struct mgs_device *mgs, + struct fs_db *fsdb) { - struct mgs_obd *mgs = &obd->u.mgs; int rc; if (!ir_timeout) @@ -454,23 +484,23 @@ int mgs_ir_init_fs(struct obd_device *obd, struct fs_db *fsdb) CFS_INIT_LIST_HEAD(&fsdb->fsdb_clients); /* start notify thread */ - fsdb->fsdb_obd = obd; + fsdb->fsdb_mgs = mgs; cfs_atomic_set(&fsdb->fsdb_notify_phase, 0); cfs_waitq_init(&fsdb->fsdb_notify_waitq); - cfs_init_completion(&fsdb->fsdb_notify_comp); + init_completion(&fsdb->fsdb_notify_comp); rc = cfs_create_thread(mgs_ir_notify, fsdb, CFS_DAEMON_FLAGS); if (rc > 0) - cfs_wait_for_completion(&fsdb->fsdb_notify_comp); + wait_for_completion(&fsdb->fsdb_notify_comp); else CERROR("Start notify thread error %d\n", rc); - mgs_nidtbl_init_fs(fsdb); + mgs_nidtbl_init_fs(env, fsdb); return 0; } -void mgs_ir_fini_fs(struct obd_device *obd, struct fs_db *fsdb) +void mgs_ir_fini_fs(struct mgs_device *mgs, struct fs_db *fsdb) { - if (cfs_test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) + if (test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) return; mgs_fsc_cleanup_by_fsdb(fsdb); @@ -481,16 +511,14 @@ void mgs_ir_fini_fs(struct obd_device *obd, struct fs_db *fsdb) fsdb->fsdb_notify_stop = 1; cfs_waitq_signal(&fsdb->fsdb_notify_waitq); - cfs_wait_for_completion(&fsdb->fsdb_notify_comp); + wait_for_completion(&fsdb->fsdb_notify_comp); } /* caller must have held fsdb_mutex */ static inline void ir_state_graduate(struct fs_db *fsdb) { - struct mgs_obd *mgs = &fsdb->fsdb_obd->u.mgs; - if (fsdb->fsdb_ir_state == IR_STARTUP) { - if (cfs_time_before(mgs->mgs_start_time + ir_timeout, + if (cfs_time_before(fsdb->fsdb_mgs->mgs_start_time + ir_timeout, cfs_time_current_sec())) { fsdb->fsdb_ir_state = IR_FULL; if (fsdb->fsdb_nonir_clients) @@ -499,7 +527,8 @@ static inline void ir_state_graduate(struct fs_db *fsdb) } } -int mgs_ir_update(struct obd_device *obd, struct mgs_target_info *mti) +int mgs_ir_update(const struct lu_env *env, struct mgs_device *mgs, + struct mgs_target_info *mti) { struct fs_db *fsdb; bool notify = true; @@ -508,16 +537,16 @@ int mgs_ir_update(struct obd_device *obd, struct mgs_target_info *mti) if (mti->mti_instance == 0) return -EINVAL; - rc = mgs_find_or_make_fsdb(obd, mti->mti_fsname, &fsdb); + rc = mgs_find_or_make_fsdb(env, mgs, mti->mti_fsname, &fsdb); if (rc) return rc; - rc = mgs_nidtbl_write(fsdb, mti); + rc = mgs_nidtbl_write(env, fsdb, mti); if (rc) return rc; /* check ir state */ - cfs_mutex_lock(&fsdb->fsdb_mutex); + mutex_lock(&fsdb->fsdb_mutex); ir_state_graduate(fsdb); switch (fsdb->fsdb_ir_state) { case IR_FULL: @@ -531,7 +560,7 @@ int mgs_ir_update(struct obd_device *obd, struct mgs_target_info *mti) default: LBUG(); } - cfs_mutex_unlock(&fsdb->fsdb_mutex); + mutex_unlock(&fsdb->fsdb_mutex); LASSERT(ergo(mti->mti_flags & LDD_F_IR_CAPABLE, notify)); if (notify) { @@ -582,7 +611,8 @@ static int delogname(char *logname, char *fsname, int *typ) int mgs_get_ir_logs(struct ptlrpc_request *req) { - struct obd_device *obd = req->rq_export->exp_obd; + struct lu_env *env = req->rq_svc_thread->t_env; + struct mgs_device *mgs = exp2mgs_dev(req->rq_export); struct fs_db *fsdb; struct mgs_config_body *body; struct mgs_config_res *res; @@ -591,7 +621,6 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) char fsname[16]; long bufsize; int unit_size; - int type; int rc = 0; int i; @@ -612,9 +641,9 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) if (rc) RETURN(rc); - rc = mgs_find_or_make_fsdb(obd, fsname, &fsdb); + rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb); if (rc) - GOTO(out, rc); + RETURN(rc); bufsize = body->mcb_units << body->mcb_bits; nrpages = (bufsize + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; @@ -638,8 +667,8 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) res->mcr_offset = body->mcb_offset; unit_size = min_t(int, 1 << body->mcb_bits, CFS_PAGE_SIZE); - bytes = mgs_nidtbl_read(obd, &fsdb->fsdb_nidtbl, res, pages, nrpages, - bufsize / unit_size, unit_size); + bytes = mgs_nidtbl_read(req->rq_export, &fsdb->fsdb_nidtbl, res, + pages, nrpages, bufsize / unit_size, unit_size); if (bytes < 0) GOTO(out, rc = bytes); @@ -652,24 +681,22 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) GOTO(out, rc = -ENOMEM); for (i = 0; i < page_count && bytes > 0; i++) { - ptlrpc_prep_bulk_page(desc, pages[i], 0, - min_t(int, bytes, CFS_PAGE_SIZE)); + ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, + min_t(int, bytes, CFS_PAGE_SIZE)); bytes -= CFS_PAGE_SIZE; } rc = target_bulk_io(req->rq_export, desc, &lwi); - ptlrpc_free_bulk(desc); + ptlrpc_free_bulk_pin(desc); out: - if (pages) { - for (i = 0; i < nrpages; i++) { - if (pages[i] == NULL) - break; - cfs_free_page(pages[i]); - } - OBD_FREE(pages, sizeof(*pages) * nrpages); - } - return rc; + for (i = 0; i < nrpages; i++) { + if (pages[i] == NULL) + break; + cfs_free_page(pages[i]); + } + OBD_FREE(pages, sizeof(*pages) * nrpages); + return rc; } static int lprocfs_ir_set_state(struct fs_db *fsdb, const char *buf) @@ -689,11 +716,11 @@ static int lprocfs_ir_set_state(struct fs_db *fsdb, const char *buf) CDEBUG(D_MGS, "change fsr state of %s from %s to %s\n", fsdb->fsdb_name, strings[fsdb->fsdb_ir_state], strings[state]); - cfs_mutex_lock(&fsdb->fsdb_mutex); + mutex_lock(&fsdb->fsdb_mutex); if (state == IR_FULL && fsdb->fsdb_nonir_clients) state = IR_PARTIAL; fsdb->fsdb_ir_state = state; - cfs_mutex_unlock(&fsdb->fsdb_mutex); + mutex_unlock(&fsdb->fsdb_mutex); return 0; } @@ -829,10 +856,11 @@ int lprocfs_wr_ir_timeout(struct file *file, const char *buffer, /* --------------- Handle non IR support clients --------------- */ /* attach a lustre file system to an export */ -int mgs_fsc_attach(struct obd_export *exp, char *fsname) +int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, + char *fsname) { struct mgs_export_data *data = &exp->u.eu_mgs_data; - struct obd_device *obd = exp->exp_obd; + struct mgs_device *mgs = exp2mgs_dev(exp); struct fs_db *fsdb; struct mgs_fsc *fsc = NULL; struct mgs_fsc *new_fsc = NULL; @@ -840,7 +868,7 @@ int mgs_fsc_attach(struct obd_export *exp, char *fsname) int rc; ENTRY; - rc = mgs_find_or_make_fsdb(obd, fsname, &fsdb); + rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb); if (rc) RETURN(rc); @@ -857,10 +885,10 @@ int mgs_fsc_attach(struct obd_export *exp, char *fsname) !!(exp->exp_connect_flags & OBD_CONNECT_IMP_RECOV); rc = -EEXIST; - cfs_mutex_lock(&fsdb->fsdb_mutex); + mutex_lock(&fsdb->fsdb_mutex); - /* tend to find it in export list because this list is shorter. */ - cfs_spin_lock(&data->med_lock); + /* tend to find it in export list because this list is shorter. */ + spin_lock(&data->med_lock); cfs_list_for_each_entry(fsc, &data->med_clients, mfc_export_list) { if (strcmp(fsname, fsc->mfc_fsdb->fsdb_name) == 0) { found = true; @@ -883,8 +911,8 @@ int mgs_fsc_attach(struct obd_export *exp, char *fsname) } rc = 0; } - cfs_spin_unlock(&data->med_lock); - cfs_mutex_unlock(&fsdb->fsdb_mutex); + spin_unlock(&data->med_lock); + mutex_unlock(&fsdb->fsdb_mutex); if (new_fsc) { class_export_put(new_fsc->mfc_export); @@ -895,33 +923,33 @@ int mgs_fsc_attach(struct obd_export *exp, char *fsname) void mgs_fsc_cleanup(struct obd_export *exp) { - struct mgs_export_data *data = &exp->u.eu_mgs_data; - struct mgs_fsc *fsc, *tmp; - CFS_LIST_HEAD(head); - - cfs_spin_lock(&data->med_lock); - cfs_list_splice_init(&data->med_clients, &head); - cfs_spin_unlock(&data->med_lock); - - cfs_list_for_each_entry_safe(fsc, tmp, &head, mfc_export_list) { - struct fs_db *fsdb = fsc->mfc_fsdb; - - LASSERT(fsc->mfc_export == exp); - - cfs_mutex_lock(&fsdb->fsdb_mutex); - cfs_list_del_init(&fsc->mfc_fsdb_list); - if (fsc->mfc_ir_capable == 0) { - --fsdb->fsdb_nonir_clients; - LASSERT(fsdb->fsdb_ir_state != IR_FULL); - if (fsdb->fsdb_nonir_clients == 0 && - fsdb->fsdb_ir_state == IR_PARTIAL) - fsdb->fsdb_ir_state = IR_FULL; - } - cfs_mutex_unlock(&fsdb->fsdb_mutex); - cfs_list_del_init(&fsc->mfc_export_list); - class_export_put(fsc->mfc_export); - OBD_FREE_PTR(fsc); - } + struct mgs_export_data *data = &exp->u.eu_mgs_data; + struct mgs_fsc *fsc, *tmp; + CFS_LIST_HEAD(head); + + spin_lock(&data->med_lock); + cfs_list_splice_init(&data->med_clients, &head); + spin_unlock(&data->med_lock); + + cfs_list_for_each_entry_safe(fsc, tmp, &head, mfc_export_list) { + struct fs_db *fsdb = fsc->mfc_fsdb; + + LASSERT(fsc->mfc_export == exp); + + mutex_lock(&fsdb->fsdb_mutex); + cfs_list_del_init(&fsc->mfc_fsdb_list); + if (fsc->mfc_ir_capable == 0) { + --fsdb->fsdb_nonir_clients; + LASSERT(fsdb->fsdb_ir_state != IR_FULL); + if (fsdb->fsdb_nonir_clients == 0 && + fsdb->fsdb_ir_state == IR_PARTIAL) + fsdb->fsdb_ir_state = IR_FULL; + } + mutex_unlock(&fsdb->fsdb_mutex); + cfs_list_del_init(&fsc->mfc_export_list); + class_export_put(fsc->mfc_export); + OBD_FREE_PTR(fsc); + } } /* must be called with fsdb->fsdb_mutex held */ @@ -936,9 +964,9 @@ void mgs_fsc_cleanup_by_fsdb(struct fs_db *fsdb) LASSERT(fsdb == fsc->mfc_fsdb); cfs_list_del_init(&fsc->mfc_fsdb_list); - cfs_spin_lock(&data->med_lock); - cfs_list_del_init(&fsc->mfc_export_list); - cfs_spin_unlock(&data->med_lock); + spin_lock(&data->med_lock); + cfs_list_del_init(&fsc->mfc_export_list); + spin_unlock(&data->med_lock); class_export_put(fsc->mfc_export); OBD_FREE_PTR(fsc); }