X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_nids.c;h=dcc0dd1ee59e15f4253fc40c387196543c56cdfa;hb=3cbe63e72c83ba50c3553d28e2fe6bc9d18c347a;hp=a2bae599b6fb1d5c9d8006ccf0726974fdd29925;hpb=8931d9070415e808e09bb4befd7cd38ef2431149;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_nids.c b/lustre/mgs/mgs_nids.c index a2bae59..dcc0dd1 100644 --- a/lustre/mgs/mgs_nids.c +++ b/lustre/mgs/mgs_nids.c @@ -15,11 +15,7 @@ * * 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 */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,9 +39,8 @@ #define DEBUG_SUBSYSTEM S_MGS #define D_MGS D_CONFIG -#ifdef __KERNEL__ +#include #include -#endif #include #include @@ -53,24 +48,24 @@ #include "mgs_internal.h" -static unsigned int ir_timeout; +static time64_t ir_timeout; static int nidtbl_is_sane(struct mgs_nidtbl *tbl) { - struct mgs_nidtbl_target *tgt; - int version = 0; + struct mgs_nidtbl_target *tgt; + int version = 0; LASSERT(mutex_is_locked(&tbl->mn_lock)); - cfs_list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { - if (!tgt->mnt_version) - continue; + list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { + if (!tgt->mnt_version) + continue; - if (version >= tgt->mnt_version) - return 0; + if (version >= tgt->mnt_version) + return 0; - version = tgt->mnt_version; - } - return 1; + version = tgt->mnt_version; + } + return 1; } /** @@ -97,7 +92,7 @@ static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, /* make sure unit_size is power 2 */ LASSERT((unit_size & (unit_size - 1)) == 0); - LASSERT(nrpages << PAGE_CACHE_SHIFT >= units_total * unit_size); + LASSERT(nrpages << PAGE_SHIFT >= units_total * unit_size); mutex_lock(&tbl->mn_lock); LASSERT(nidtbl_is_sane(tbl)); @@ -113,7 +108,7 @@ static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, * otherwise, it's for clients, then llog entries for both OSTs and * MDTs will be returned. */ - cfs_list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { + list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { int entry_len = sizeof(*entry); if (tgt->mnt_version < version) @@ -136,27 +131,18 @@ static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, break; } - /* check if we need to consume remaining bytes. */ - if (last_in_unit != NULL && bytes_in_unit) { -#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 + /* check if we need to consume remaining bytes. */ + if (last_in_unit != NULL && bytes_in_unit) { 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; - } - LASSERT((rc & (unit_size - 1)) == 0); + rc += bytes_in_unit; + buf += bytes_in_unit; + last_in_unit = NULL; + } + LASSERT((rc & (unit_size - 1)) == 0); if (units_in_page == 0) { /* allocate a new page */ - pages[index] = alloc_page(GFP_IOFS); + pages[index] = alloc_page(GFP_KERNEL); if (pages[index] == NULL) { rc = -ENOMEM; break; @@ -170,7 +156,7 @@ static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, buf = kmap(pages[index]); ++index; - units_in_page = PAGE_CACHE_SIZE / unit_size; + units_in_page = PAGE_SIZE / unit_size; LASSERT(units_in_page > 0); } @@ -190,19 +176,13 @@ static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl, entry->mne_type = tgt->mnt_type; entry->mne_nid_type = 0; entry->mne_nid_size = sizeof(lnet_nid_t); - entry->mne_nid_count = mti->mti_nid_count; - memcpy(entry->u.nids, mti->mti_nids, - mti->mti_nid_count * sizeof(lnet_nid_t)); + entry->mne_nid_count = mti->mti_nid_count; + memcpy(entry->u.nids, mti->mti_nids, + mti->mti_nid_count * sizeof(lnet_nid_t)); -#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; - buf += entry_len; + version = tgt->mnt_version; + rc += entry_len; + buf += entry_len; bytes_in_unit -= entry_len; last_in_unit = entry; @@ -240,6 +220,9 @@ static int nidtbl_update_version(const struct lu_env *env, int rc; ENTRY; + if (mgs->mgs_bottom->dd_rdonly) + RETURN(0); + LASSERT(mutex_is_locked(&tbl->mn_lock)); fsdb = local_file_find_or_create(env, mgs->mgs_los, mgs->mgs_nidtbl_dir, @@ -253,7 +236,7 @@ static int nidtbl_update_version(const struct lu_env *env, GOTO(out_put, rc = PTR_ERR(th)); th->th_sync = 1; /* update table synchronously */ - rc = dt_declare_record_write(env, fsdb, buf.lb_len, off, th); + rc = dt_declare_record_write(env, fsdb, &buf, off, th); if (rc) GOTO(out, rc); @@ -267,7 +250,7 @@ static int nidtbl_update_version(const struct lu_env *env, out: dt_trans_stop(env, mgs->mgs_bottom, th); out_put: - lu_object_put(env, &fsdb->do_lu); + dt_object_put(env, fsdb); RETURN(rc); } @@ -315,7 +298,7 @@ static int nidtbl_read_version(const struct lu_env *env, 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); + dt_object_put(env, fsdb); RETURN(rc); } @@ -332,10 +315,11 @@ static int mgs_nidtbl_write(const struct lu_env *env, struct fs_db *fsdb, type &= ~LDD_F_SV_TYPE_MGS; LASSERT(type != 0); - tbl = &fsdb->fsdb_nidtbl; + tbl = &fsdb->fsdb_nidtbl; mutex_lock(&tbl->mn_lock); - cfs_list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { - struct mgs_target_info *info = &tgt->mnt_mti; + list_for_each_entry(tgt, &tbl->mn_targets, mnt_list) { + struct mgs_target_info *info = &tgt->mnt_mti; + if (type == tgt->mnt_type && mti->mti_stripe_index == info->mti_stripe_index) { found = true; @@ -347,21 +331,21 @@ static int mgs_nidtbl_write(const struct lu_env *env, struct fs_db *fsdb, if (tgt == NULL) GOTO(out, rc = -ENOMEM); - CFS_INIT_LIST_HEAD(&tgt->mnt_list); - tgt->mnt_fs = tbl; - tgt->mnt_version = 0; /* 0 means invalid */ - tgt->mnt_type = type; + INIT_LIST_HEAD(&tgt->mnt_list); + tgt->mnt_fs = tbl; + tgt->mnt_version = 0; /* 0 means invalid */ + tgt->mnt_type = type; - ++tbl->mn_nr_targets; - } + ++tbl->mn_nr_targets; + } - tgt->mnt_version = ++tbl->mn_version; - tgt->mnt_mti = *mti; + tgt->mnt_version = ++tbl->mn_version; + tgt->mnt_mti = *mti; - cfs_list_move_tail(&tgt->mnt_list, &tbl->mn_targets); + list_move_tail(&tgt->mnt_list, &tbl->mn_targets); rc = nidtbl_update_version(env, fsdb->fsdb_mgs, tbl); - EXIT; + EXIT; out: mutex_unlock(&tbl->mn_lock); @@ -374,17 +358,17 @@ out: static void mgs_nidtbl_fini_fs(struct fs_db *fsdb) { struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; - CFS_LIST_HEAD(head); + struct list_head head = LIST_HEAD_INIT(head); mutex_lock(&tbl->mn_lock); tbl->mn_nr_targets = 0; - cfs_list_splice_init(&tbl->mn_targets, &head); + list_splice_init(&tbl->mn_targets, &head); mutex_unlock(&tbl->mn_lock); - while (!cfs_list_empty(&head)) { + while (!list_empty(&head)) { struct mgs_nidtbl_target *tgt; tgt = list_entry(head.next, struct mgs_nidtbl_target, mnt_list); - cfs_list_del(&tgt->mnt_list); + list_del(&tgt->mnt_list); OBD_FREE_PTR(tgt); } } @@ -394,7 +378,7 @@ 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); + INIT_LIST_HEAD(&tbl->mn_targets); mutex_init(&tbl->mn_lock); tbl->mn_nr_targets = 0; tbl->mn_fsdb = fsdb; @@ -414,37 +398,34 @@ static int mgs_nidtbl_init_fs(const struct lu_env *env, struct fs_db *fsdb) /* --------- Imperative Recovery relies on nidtbl stuff ------- */ void mgs_ir_notify_complete(struct fs_db *fsdb) { - struct timeval tv; - cfs_duration_t delta; + struct timespec64 ts; + ktime_t delta; atomic_set(&fsdb->fsdb_notify_phase, 0); - /* do statistic */ - fsdb->fsdb_notify_count++; - delta = cfs_time_sub(cfs_time_current(), fsdb->fsdb_notify_start); - fsdb->fsdb_notify_total += delta; - if (delta > fsdb->fsdb_notify_max) - fsdb->fsdb_notify_max = delta; + /* do statistic */ + fsdb->fsdb_notify_count++; + delta = ktime_sub(ktime_get(), fsdb->fsdb_notify_start); + fsdb->fsdb_notify_total = ktime_add(fsdb->fsdb_notify_total, delta); + if (ktime_after(delta, fsdb->fsdb_notify_max)) + fsdb->fsdb_notify_max = delta; - cfs_duration_usec(delta, &tv); - CDEBUG(D_MGS, "Revoke recover lock of %s completed after %ld.%06lds\n", - fsdb->fsdb_name, tv.tv_sec, tv.tv_usec); + ts = ktime_to_timespec64(fsdb->fsdb_notify_max); + CDEBUG(D_MGS, "Revoke recover lock of %s completed after %lld.%09lds\n", + fsdb->fsdb_name, (s64)ts.tv_sec, ts.tv_nsec); } static int mgs_ir_notify(void *arg) { - struct fs_db *fsdb = arg; - struct ldlm_res_id resid; - - char name[sizeof(fsdb->fsdb_name) + 20]; + struct fs_db *fsdb = arg; + struct ldlm_res_id resid; + char name[sizeof(fsdb->fsdb_name) + 16]; - LASSERTF(sizeof(name) < 32, "name is too large to be in stack.\n"); - sprintf(name, "mgs_%s_notify", fsdb->fsdb_name); + CLASSERT(sizeof(name) < 40); /* name is too large to be on stack */ + snprintf(name, sizeof(name) - 1, "mgs_%s_notify", fsdb->fsdb_name); complete(&fsdb->fsdb_notify_comp); - - set_user_nice(current, -2); - + set_user_nice(current, -2); mgc_fsname2resid(fsdb->fsdb_name, &resid, CONFIG_T_RECOVER); while (1) { struct l_wait_info lwi = { 0 }; @@ -459,7 +440,7 @@ static int mgs_ir_notify(void *arg) CDEBUG(D_MGS, "%s woken up, phase is %d\n", name, atomic_read(&fsdb->fsdb_notify_phase)); - fsdb->fsdb_notify_start = cfs_time_current(); + fsdb->fsdb_notify_start = ktime_get(); mgs_revoke_lock(fsdb->fsdb_mgs, fsdb, CONFIG_T_RECOVER); } @@ -473,21 +454,14 @@ int mgs_ir_init_fs(const struct lu_env *env, struct mgs_device *mgs, struct task_struct *task; if (!ir_timeout) - ir_timeout = OBD_IR_MGS_TIMEOUT; + ir_timeout = (time64_t)OBD_IR_MGS_TIMEOUT; fsdb->fsdb_ir_state = IR_FULL; - if (cfs_time_before(cfs_time_current_sec(), - mgs->mgs_start_time + ir_timeout)) + if (mgs->mgs_start_time + ir_timeout > ktime_get_real_seconds()) fsdb->fsdb_ir_state = IR_STARTUP; fsdb->fsdb_nonir_clients = 0; - CFS_INIT_LIST_HEAD(&fsdb->fsdb_clients); - /* start notify thread */ fsdb->fsdb_mgs = mgs; - atomic_set(&fsdb->fsdb_notify_phase, 0); - init_waitqueue_head(&fsdb->fsdb_notify_waitq); - init_completion(&fsdb->fsdb_notify_comp); - task = kthread_run(mgs_ir_notify, fsdb, "mgs_%s_notify", fsdb->fsdb_name); if (!IS_ERR(task)) @@ -508,7 +482,7 @@ void mgs_ir_fini_fs(struct mgs_device *mgs, struct fs_db *fsdb) mgs_nidtbl_fini_fs(fsdb); - LASSERT(cfs_list_empty(&fsdb->fsdb_clients)); + LASSERT(list_empty(&fsdb->fsdb_clients)); fsdb->fsdb_notify_stop = 1; wake_up(&fsdb->fsdb_notify_waitq); @@ -519,8 +493,8 @@ void mgs_ir_fini_fs(struct mgs_device *mgs, struct fs_db *fsdb) static inline void ir_state_graduate(struct fs_db *fsdb) { if (fsdb->fsdb_ir_state == IR_STARTUP) { - if (cfs_time_before(fsdb->fsdb_mgs->mgs_start_time + ir_timeout, - cfs_time_current_sec())) { + if (ktime_get_real_seconds() > + fsdb->fsdb_mgs->mgs_start_time + ir_timeout) { fsdb->fsdb_ir_state = IR_FULL; if (fsdb->fsdb_nonir_clients) fsdb->fsdb_ir_state = IR_PARTIAL; @@ -544,7 +518,7 @@ int mgs_ir_update(const struct lu_env *env, struct mgs_device *mgs, rc = mgs_nidtbl_write(env, fsdb, mti); if (rc) - return rc; + GOTO(out, rc); /* check ir state */ mutex_lock(&fsdb->fsdb_mutex); @@ -570,7 +544,10 @@ int mgs_ir_update(const struct lu_env *env, struct mgs_device *mgs, atomic_inc(&fsdb->fsdb_notify_phase); wake_up(&fsdb->fsdb_notify_waitq); } - return 0; + +out: + mgs_put_fsdb(mgs, fsdb); + return rc; } /* NID table can be cached by two entities: Clients and MDTs */ @@ -614,7 +591,7 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) { struct lu_env *env = req->rq_svc_thread->t_env; struct mgs_device *mgs = exp2mgs_dev(req->rq_export); - struct fs_db *fsdb; + struct fs_db *fsdb = NULL; struct mgs_config_body *body; struct mgs_config_res *res; struct ptlrpc_bulk_desc *desc; @@ -642,57 +619,71 @@ int mgs_get_ir_logs(struct ptlrpc_request *req) if (rc) RETURN(rc); + bufsize = body->mcb_units << body->mcb_bits; + nrpages = (bufsize + PAGE_SIZE - 1) >> PAGE_SHIFT; + if (nrpages > PTLRPC_MAX_BRW_PAGES) + RETURN(-EINVAL); + rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb); - if (rc) + if (rc) RETURN(rc); - bufsize = body->mcb_units << body->mcb_bits; - nrpages = (bufsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; - if (nrpages > PTLRPC_MAX_BRW_PAGES) - RETURN(-EINVAL); - - CDEBUG(D_MGS, "Reading IR log %s bufsize %ld.\n", - body->mcb_name, bufsize); + CDEBUG(D_MGS, "Reading IR log %s bufsize %ld.\n", + body->mcb_name, bufsize); - OBD_ALLOC(pages, sizeof(*pages) * nrpages); - if (pages == NULL) - RETURN(-ENOMEM); + OBD_ALLOC(pages, sizeof(*pages) * nrpages); + if (!pages) + GOTO(out, rc = -ENOMEM); - res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); - if (res == NULL) - GOTO(out, rc = -EINVAL); + res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); + if (!res) + GOTO(out, rc = -EINVAL); - res->mcr_offset = body->mcb_offset; - unit_size = min_t(int, 1 << body->mcb_bits, PAGE_CACHE_SIZE); + res->mcr_offset = body->mcb_offset; + unit_size = min_t(int, 1 << body->mcb_bits, PAGE_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); /* start bulk transfer */ - page_count = (bytes + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; + page_count = (bytes + PAGE_SIZE - 1) >> PAGE_SHIFT; LASSERT(page_count <= nrpages); desc = ptlrpc_prep_bulk_exp(req, page_count, 1, - BULK_PUT_SOURCE, MGS_BULK_PORTAL); - if (desc == NULL) + PTLRPC_BULK_PUT_SOURCE | + PTLRPC_BULK_BUF_KIOV, + MGS_BULK_PORTAL, + &ptlrpc_bulk_kiov_pin_ops); + if (!desc) GOTO(out, rc = -ENOMEM); for (i = 0; i < page_count && bytes > 0; i++) { - ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, - min_t(int, bytes, PAGE_CACHE_SIZE)); - bytes -= PAGE_CACHE_SIZE; - } + desc->bd_frag_ops->add_kiov_frag(desc, pages[i], 0, + min_t(int, bytes, + PAGE_SIZE)); + bytes -= PAGE_SIZE; + } + + rc = target_bulk_io(req->rq_export, desc, &lwi); + ptlrpc_free_bulk(desc); - rc = target_bulk_io(req->rq_export, desc, &lwi); - ptlrpc_free_bulk_pin(desc); + GOTO(out, rc); out: - for (i = 0; i < nrpages; i++) { - if (pages[i] == NULL) - break; - __free_page(pages[i]); + if (pages) { + for (i = 0; i < nrpages; i++) { + if (!pages[i]) + break; + + __free_page(pages[i]); + } + + OBD_FREE(pages, sizeof(*pages) * nrpages); } - OBD_FREE(pages, sizeof(*pages) * nrpages); + + if (fsdb) + mgs_put_fsdb(mgs, fsdb); + return rc; } @@ -729,13 +720,13 @@ static int lprocfs_ir_set_timeout(struct fs_db *fsdb, const char *buf) static int lprocfs_ir_clear_stats(struct fs_db *fsdb, const char *buf) { - if (*buf) - return -EINVAL; + if (*buf) + return -EINVAL; - fsdb->fsdb_notify_total = 0; - fsdb->fsdb_notify_max = 0; - fsdb->fsdb_notify_count = 0; - return 0; + fsdb->fsdb_notify_total = ktime_set(0, 0); + fsdb->fsdb_notify_max = ktime_set(0, 0); + fsdb->fsdb_notify_count = 0; + return 0; } static struct lproc_ir_cmd { @@ -748,25 +739,25 @@ static struct lproc_ir_cmd { { "0", 1, lprocfs_ir_clear_stats } }; -int lprocfs_wr_ir_state(struct file *file, const char *buffer, - unsigned long count, void *data) +int lprocfs_wr_ir_state(struct file *file, const char __user *buffer, + size_t count, void *data) { struct fs_db *fsdb = data; char *kbuf; char *ptr; int rc = 0; - if (count > PAGE_CACHE_SIZE) - return -EINVAL; + if (count == 0 || count >= PAGE_SIZE) + return -EINVAL; - OBD_ALLOC(kbuf, count + 1); - if (kbuf == NULL) - return -ENOMEM; + OBD_ALLOC(kbuf, count + 1); + if (kbuf == NULL) + return -ENOMEM; - if (copy_from_user(kbuf, buffer, count)) { - OBD_FREE(kbuf, count); - return -EFAULT; - } + if (copy_from_user(kbuf, buffer, count)) { + OBD_FREE(kbuf, count + 1); + return -EFAULT; + } kbuf[count] = 0; /* buffer is supposed to end with 0 */ if (kbuf[count - 1] == '\n') @@ -808,11 +799,11 @@ int lprocfs_wr_ir_state(struct file *file, const char *buffer, int lprocfs_rd_ir_state(struct seq_file *seq, void *data) { - struct fs_db *fsdb = data; - struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; - const char *ir_strings[] = IR_STRINGS; - struct timeval tv_max; - struct timeval tv; + struct fs_db *fsdb = data; + struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl; + const char *ir_strings[] = IR_STRINGS; + struct timespec64 ts_max; + struct timespec64 ts; /* mgs_live_seq_show() already holds fsdb_mutex. */ ir_state_graduate(fsdb); @@ -825,28 +816,27 @@ int lprocfs_rd_ir_state(struct seq_file *seq, void *data) ir_strings[fsdb->fsdb_ir_state], fsdb->fsdb_nonir_clients, tbl->mn_version); - cfs_duration_usec(fsdb->fsdb_notify_total, &tv); - cfs_duration_usec(fsdb->fsdb_notify_max, &tv_max); + ts = ktime_to_timespec64(fsdb->fsdb_notify_total); + ts_max = ktime_to_timespec64(fsdb->fsdb_notify_max); - seq_printf(seq, " notify_duration_total: %lu.%06lu\n" - " notify_duation_max: %lu.%06lu\n" - " notify_count: %u\n", - tv.tv_sec, tv.tv_usec, - tv_max.tv_sec, tv_max.tv_usec, - fsdb->fsdb_notify_count); + seq_printf(seq, " notify_duration_total: %lld.%09ld\n" + " notify_duation_max: %lld.%09ld\n" + " notify_count: %u\n", + (s64)ts.tv_sec, ts.tv_nsec, + (s64)ts_max.tv_sec, ts_max.tv_nsec, + fsdb->fsdb_notify_count); - return 0; + return 0; } -int lprocfs_rd_ir_timeout(char *page, char **start, off_t off, int count, - int *eof, void *data) +int lprocfs_ir_timeout_seq_show(struct seq_file *m, void *data) { - *eof = 1; - return snprintf(page, count, "%d\n", ir_timeout); + return lprocfs_u64_seq_show(m, &ir_timeout); } -int lprocfs_wr_ir_timeout(struct file *file, const char *buffer, - unsigned long count, void *data) +ssize_t lprocfs_ir_timeout_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { return lprocfs_wr_uint(file, buffer, count, &ir_timeout); } @@ -856,9 +846,9 @@ int lprocfs_wr_ir_timeout(struct file *file, const char *buffer, 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 mgs_export_data *data = &exp->u.eu_mgs_data; struct mgs_device *mgs = exp2mgs_dev(exp); - struct fs_db *fsdb; + struct fs_db *fsdb = NULL; struct mgs_fsc *fsc = NULL; struct mgs_fsc *new_fsc = NULL; bool found = false; @@ -871,11 +861,11 @@ int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, /* allocate a new fsc in case we need it in spinlock. */ OBD_ALLOC_PTR(new_fsc); - if (new_fsc == NULL) - RETURN(-ENOMEM); + if (!new_fsc) + GOTO(out, rc = -ENOMEM); - CFS_INIT_LIST_HEAD(&new_fsc->mfc_export_list); - CFS_INIT_LIST_HEAD(&new_fsc->mfc_fsdb_list); + INIT_LIST_HEAD(&new_fsc->mfc_export_list); + INIT_LIST_HEAD(&new_fsc->mfc_fsdb_list); new_fsc->mfc_fsdb = fsdb; new_fsc->mfc_export = class_export_get(exp); new_fsc->mfc_ir_capable = !!(exp_connect_flags(exp) & @@ -886,7 +876,7 @@ int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, /* 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) { + list_for_each_entry(fsc, &data->med_clients, mfc_export_list) { if (strcmp(fsname, fsc->mfc_fsdb->fsdb_name) == 0) { found = true; break; @@ -897,10 +887,10 @@ int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, new_fsc = NULL; /* add it into export list. */ - cfs_list_add(&fsc->mfc_export_list, &data->med_clients); + list_add(&fsc->mfc_export_list, &data->med_clients); /* add into fsdb list. */ - cfs_list_add(&fsc->mfc_fsdb_list, &fsdb->fsdb_clients); + list_add(&fsc->mfc_fsdb_list, &fsdb->fsdb_clients); if (!fsc->mfc_ir_capable) { ++fsdb->fsdb_nonir_clients; if (fsdb->fsdb_ir_state == IR_FULL) @@ -915,26 +905,29 @@ int mgs_fsc_attach(const struct lu_env *env, struct obd_export *exp, class_export_put(new_fsc->mfc_export); OBD_FREE_PTR(new_fsc); } - RETURN(rc); + +out: + mgs_put_fsdb(mgs, fsdb); + RETURN(rc); } 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); + struct list_head head = LIST_HEAD_INIT(head); spin_lock(&data->med_lock); - cfs_list_splice_init(&data->med_clients, &head); + list_splice_init(&data->med_clients, &head); spin_unlock(&data->med_lock); - cfs_list_for_each_entry_safe(fsc, tmp, &head, mfc_export_list) { + 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); + list_del_init(&fsc->mfc_fsdb_list); if (fsc->mfc_ir_capable == 0) { --fsdb->fsdb_nonir_clients; LASSERT(fsdb->fsdb_ir_state != IR_FULL); @@ -943,7 +936,7 @@ void mgs_fsc_cleanup(struct obd_export *exp) fsdb->fsdb_ir_state = IR_FULL; } mutex_unlock(&fsdb->fsdb_mutex); - cfs_list_del_init(&fsc->mfc_export_list); + list_del_init(&fsc->mfc_export_list); class_export_put(fsc->mfc_export); OBD_FREE_PTR(fsc); } @@ -954,15 +947,15 @@ void mgs_fsc_cleanup_by_fsdb(struct fs_db *fsdb) { struct mgs_fsc *fsc, *tmp; - cfs_list_for_each_entry_safe(fsc, tmp, &fsdb->fsdb_clients, + list_for_each_entry_safe(fsc, tmp, &fsdb->fsdb_clients, mfc_fsdb_list) { struct mgs_export_data *data = &fsc->mfc_export->u.eu_mgs_data; LASSERT(fsdb == fsc->mfc_fsdb); - cfs_list_del_init(&fsc->mfc_fsdb_list); + list_del_init(&fsc->mfc_fsdb_list); spin_lock(&data->med_lock); - cfs_list_del_init(&fsc->mfc_export_list); + list_del_init(&fsc->mfc_export_list); spin_unlock(&data->med_lock); class_export_put(fsc->mfc_export); OBD_FREE_PTR(fsc);