X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status.c;h=9978fe8fc5bd691853c9e77d7f1b14e5d48789e5;hp=2004be3fa56ecd90377d22f07cdcab4075a904d5;hb=2f347eb0da65973bfc4acbd49ad48698bf71441f;hpb=2e6f5c160a4acdd509ca7b4245e96ed83b19bb57 diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 2004be3..9978fe8 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -58,7 +58,7 @@ #define MAX_STRING_SIZE 128 /* for bug 10866, global variable */ -DECLARE_RWSEM(_lprocfs_lock); +CFS_DECLARE_RWSEM(_lprocfs_lock); EXPORT_SYMBOL(_lprocfs_lock); int lprocfs_seq_release(struct inode *inode, struct file *file) @@ -145,17 +145,29 @@ cfs_proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root, } struct proc_dir_entry *lprocfs_add_symlink(const char *name, - struct proc_dir_entry *parent, const char *dest) + struct proc_dir_entry *parent, const char *format, ...) { struct proc_dir_entry *entry; + char *dest; + va_list ap; - if (parent == NULL || dest == NULL) + if (parent == NULL || format == NULL) return NULL; + OBD_ALLOC_WAIT(dest, MAX_STRING_SIZE + 1); + if (dest == NULL) + return NULL; + + va_start(ap, format); + vsnprintf(dest, MAX_STRING_SIZE, format, ap); + va_end(ap); + entry = proc_symlink(name, parent, dest); if (entry == NULL) CERROR("LprocFS: Could not create symbolic link from %s to %s", name, dest); + + OBD_FREE(dest, MAX_STRING_SIZE + 1); return entry; } @@ -199,7 +211,7 @@ static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, } count = (rc < size) ? rc : size; - if (copy_to_user(buf, start, count)) { + if (cfs_copy_to_user(buf, start, count)) { rc = -EFAULT; goto out; } @@ -235,7 +247,7 @@ int lprocfs_evict_client_open(struct inode *inode, struct file *f) struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); struct obd_device *obd = dp->data; - atomic_inc(&obd->obd_evict_inprogress); + cfs_atomic_inc(&obd->obd_evict_inprogress); return 0; } @@ -245,8 +257,8 @@ int lprocfs_evict_client_release(struct inode *inode, struct file *f) struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); struct obd_device *obd = dp->data; - atomic_dec(&obd->obd_evict_inprogress); - wake_up(&obd->obd_evict_inprogress_waitq); + cfs_atomic_dec(&obd->obd_evict_inprogress); + cfs_waitq_signal(&obd->obd_evict_inprogress_waitq); return 0; } @@ -427,7 +439,7 @@ int lprocfs_wr_uint(struct file *file, const char *buffer, unsigned long tmp; dummy[MAX_STRING_SIZE] = '\0'; - if (copy_from_user(dummy, buffer, MAX_STRING_SIZE)) + if (cfs_copy_from_user(dummy, buffer, MAX_STRING_SIZE)) return -EFAULT; tmp = simple_strtoul(dummy, &end, 0); @@ -449,16 +461,16 @@ int lprocfs_rd_u64(char *page, char **start, off_t off, int lprocfs_rd_atomic(char *page, char **start, off_t off, int count, int *eof, void *data) { - atomic_t *atom = data; + cfs_atomic_t *atom = data; LASSERT(atom != NULL); *eof = 1; - return snprintf(page, count, "%d\n", atomic_read(atom)); + return snprintf(page, count, "%d\n", cfs_atomic_read(atom)); } int lprocfs_wr_atomic(struct file *file, const char *buffer, unsigned long count, void *data) { - atomic_t *atm = data; + cfs_atomic_t *atm = data; int val = 0; int rc; @@ -469,7 +481,7 @@ int lprocfs_wr_atomic(struct file *file, const char *buffer, if (val <= 0) return -ERANGE; - atomic_set(atm, val); + cfs_atomic_set(atm, val); return count; } @@ -509,7 +521,7 @@ int lprocfs_rd_blksize(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -522,7 +534,7 @@ int lprocfs_rd_kbytestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -541,7 +553,7 @@ int lprocfs_rd_kbytesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -560,7 +572,7 @@ int lprocfs_rd_kbytesavail(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -579,7 +591,7 @@ int lprocfs_rd_filestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -593,7 +605,7 @@ int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ, + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -668,20 +680,23 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx, if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); for (i = 0; i < num_cpu; i++) { percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[idx]; do { - centry = atomic_read(&percpu_cntr->lc_cntl.la_entry); + centry = cfs_atomic_read(&percpu_cntr-> \ + lc_cntl.la_entry); t.lc_count = percpu_cntr->lc_count; t.lc_sum = percpu_cntr->lc_sum; t.lc_min = percpu_cntr->lc_min; t.lc_max = percpu_cntr->lc_max; t.lc_sumsquare = percpu_cntr->lc_sumsquare; - } while (centry != atomic_read(&percpu_cntr->lc_cntl.la_entry) && - centry != atomic_read(&percpu_cntr->lc_cntl.la_exit)); + } while (centry != cfs_atomic_read(&percpu_cntr->lc_cntl. \ + la_entry) && + centry != cfs_atomic_read(&percpu_cntr->lc_cntl. \ + la_exit)); cnt->lc_count += t.lc_count; cnt->lc_sum += t.lc_sum; if (t.lc_min < cnt->lc_min) @@ -813,7 +828,7 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, " in-progress_invalidations: %u\n", imp->imp_conn_cnt, imp->imp_generation, - atomic_read(&imp->imp_inval_count)); + cfs_atomic_read(&imp->imp_inval_count)); lprocfs_stats_collect(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR, &ret); do_div(ret.lc_sum, ret.lc_count); @@ -823,9 +838,9 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, " unregistering: %u\n" " timeouts: %u\n" " avg_waittime: "LPU64" %s\n", - atomic_read(&imp->imp_inflight), - atomic_read(&imp->imp_unregistering), - atomic_read(&imp->imp_timeouts), + cfs_atomic_read(&imp->imp_inflight), + cfs_atomic_read(&imp->imp_unregistering), + cfs_atomic_read(&imp->imp_timeouts), ret.lc_sum, ret.lc_units); k = 0; @@ -925,30 +940,6 @@ int lprocfs_at_hist_helper(char *page, int count, int rc, return rc; } -int lprocfs_rd_quota_resend_count(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct obd_device *obd = data; - - return snprintf(page, count, "%d\n", - atomic_read(&obd->u.cli.cl_quota_resends)); -} - -int lprocfs_wr_quota_resend_count(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *obd = data; - int val, rc; - - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; - - atomic_set(&obd->u.cli.cl_quota_resends, val); - - return count; -} - /* See also ptlrpc_lprocfs_rd_timeouts */ int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1081,10 +1072,11 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat) client_stat->nid_proc, client_stat->nid_stats, client_stat->nid_brw_stats); - LASSERTF(atomic_read(&client_stat->nid_exp_ref_count) == 0, - "count %d\n", atomic_read(&client_stat->nid_exp_ref_count)); + LASSERTF(cfs_atomic_read(&client_stat->nid_exp_ref_count) == 0, + "count %d\n", + cfs_atomic_read(&client_stat->nid_exp_ref_count)); - hlist_del_init(&client_stat->nid_hash); + cfs_hlist_del_init(&client_stat->nid_hash); if (client_stat->nid_proc) lprocfs_remove(&client_stat->nid_proc); @@ -1110,10 +1102,10 @@ void lprocfs_free_per_client_stats(struct obd_device *obd) /* we need extra list - because hash_exit called to early */ /* not need locking because all clients is died */ - while(!list_empty(&obd->obd_nid_stats)) { - stat = list_entry(obd->obd_nid_stats.next, - struct nid_stat, nid_list); - list_del_init(&stat->nid_list); + while(!cfs_list_empty(&obd->obd_nid_stats)) { + stat = cfs_list_entry(obd->obd_nid_stats.next, + struct nid_stat, nid_list); + cfs_list_del_init(&stat->nid_list); lprocfs_free_client_stats(stat); } @@ -1134,7 +1126,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, if (flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); OBD_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); if (stats == NULL) @@ -1142,7 +1134,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, if (flags & LPROCFS_STATS_FLAG_NOPERCPU) { stats->ls_flags = flags; - spin_lock_init(&stats->ls_lock); + cfs_spin_lock_init(&stats->ls_lock); /* Use this lock only if there are no percpu areas */ } else { stats->ls_flags = 0; @@ -1150,7 +1142,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]); if (num_cpu > 1) - percpusize = L1_CACHE_ALIGN(percpusize); + percpusize = CFS_L1_CACHE_ALIGN(percpusize); for (i = 0; i < num_cpu; i++) { OBD_ALLOC(stats->ls_percpu[i], percpusize); @@ -1186,11 +1178,11 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh) if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); percpusize = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]); if (num_cpu > 1) - percpusize = L1_CACHE_ALIGN(percpusize); + percpusize = CFS_L1_CACHE_ALIGN(percpusize); for (i = 0; i < num_cpu; i++) OBD_FREE(stats->ls_percpu[i], percpusize); OBD_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); @@ -1207,13 +1199,13 @@ void lprocfs_clear_stats(struct lprocfs_stats *stats) for (i = 0; i < num_cpu; i++) { for (j = 0; j < stats->ls_num; j++) { percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[j]; - atomic_inc(&percpu_cntr->lc_cntl.la_entry); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_entry); percpu_cntr->lc_count = 0; percpu_cntr->lc_sum = 0; percpu_cntr->lc_min = LC_MIN_INIT; percpu_cntr->lc_max = 0; percpu_cntr->lc_sumsquare = 0; - atomic_inc(&percpu_cntr->lc_cntl.la_exit); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_exit); } } @@ -1261,7 +1253,7 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v) if (cntr == &(stats->ls_percpu[0])->lp_cntr[0]) { struct timeval now; - do_gettimeofday(&now); + cfs_gettimeofday(&now); rc = seq_printf(p, "%-25s %lu.%lu secs.usecs\n", "snapshot_time", now.tv_sec, now.tv_usec); if (rc < 0) @@ -1648,8 +1640,8 @@ int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count, *eof = 1; page[0] = '\0'; lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len); - lustre_hash_for_each_key(obd->obd_nid_hash, &stats->nid, - lprocfs_exp_print_uuid, &cb_data); + cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_uuid, &cb_data); return (*cb_data.len); } @@ -1657,16 +1649,16 @@ void lprocfs_exp_print_hash(void *obj, void *cb_data) { struct exp_uuid_cb_data *data = cb_data; struct obd_export *exp = obj; - lustre_hash_t *lh; + cfs_hash_t *hs; - lh = exp->exp_lock_hash; - if (lh) { + hs = exp->exp_lock_hash; + if (hs) { if (!*data->len) - *data->len += lustre_hash_debug_header(data->page, - data->count); + *data->len += cfs_hash_debug_header(data->page, + data->count); - *data->len += lustre_hash_debug_str(lh, data->page + *data->len, - data->count); + *data->len += cfs_hash_debug_str(hs, data->page + *data->len, + data->count); } } @@ -1682,8 +1674,8 @@ int lprocfs_exp_rd_hash(char *page, char **start, off_t off, int count, page[0] = '\0'; lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len); - lustre_hash_for_each_key(obd->obd_nid_hash, &stats->nid, - lprocfs_exp_print_hash, &cb_data); + cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_hash, &cb_data); return (*cb_data.len); } @@ -1704,13 +1696,13 @@ void lprocfs_nid_stats_clear_write_cb(void *obj, void *data) ENTRY; /* object has only hash + iterate_all references. * add/delete blocked by hash bucket lock */ - CDEBUG(D_INFO,"refcnt %d\n", atomic_read(&stat->nid_exp_ref_count)); - if (atomic_read(&stat->nid_exp_ref_count) == 2) { - hlist_del_init(&stat->nid_hash); + CDEBUG(D_INFO,"refcnt %d\n", cfs_atomic_read(&stat->nid_exp_ref_count)); + if (cfs_atomic_read(&stat->nid_exp_ref_count) == 2) { + cfs_hlist_del_init(&stat->nid_hash); nidstat_putref(stat); - spin_lock(&stat->nid_obd->obd_nid_lock); - list_move(&stat->nid_list, data); - spin_unlock(&stat->nid_obd->obd_nid_lock); + cfs_spin_lock(&stat->nid_obd->obd_nid_lock); + cfs_list_move(&stat->nid_list, data); + cfs_spin_unlock(&stat->nid_obd->obd_nid_lock); EXIT; return; } @@ -1733,13 +1725,13 @@ int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, struct nid_stat *client_stat; CFS_LIST_HEAD(free_list); - lustre_hash_for_each(obd->obd_nid_stats_hash, - lprocfs_nid_stats_clear_write_cb, &free_list); + cfs_hash_for_each(obd->obd_nid_stats_hash, + lprocfs_nid_stats_clear_write_cb, &free_list); - while (!list_empty(&free_list)) { - client_stat = list_entry(free_list.next, struct nid_stat, - nid_list); - list_del_init(&client_stat->nid_list); + while (!cfs_list_empty(&free_list)) { + client_stat = cfs_list_entry(free_list.next, struct nid_stat, + nid_list); + cfs_list_del_init(&client_stat->nid_list); lprocfs_free_client_stats(client_stat); } @@ -1752,6 +1744,7 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) struct nid_stat *new_stat, *old_stat; struct obd_device *obd = NULL; cfs_proc_dir_entry_t *entry; + char *buffer = NULL; int rc = 0; ENTRY; @@ -1777,36 +1770,43 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) new_stat->nid = *nid; new_stat->nid_obd = exp->exp_obd; - atomic_set(&new_stat->nid_exp_ref_count, 0); + cfs_atomic_set(&new_stat->nid_exp_ref_count, 0); - old_stat = lustre_hash_findadd_unique(obd->obd_nid_stats_hash, - nid, &new_stat->nid_hash); + old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash, + nid, &new_stat->nid_hash); CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n", old_stat, libcfs_nid2str(*nid), - atomic_read(&new_stat->nid_exp_ref_count)); + cfs_atomic_read(&new_stat->nid_exp_ref_count)); /* Return -EALREADY here so that we know that the /proc * entry already has been created */ if (old_stat != new_stat) { - spin_lock(&obd->obd_nid_lock); + cfs_spin_lock(&obd->obd_nid_lock); if (exp->exp_nid_stats != old_stat) { if (exp->exp_nid_stats) nidstat_putref(exp->exp_nid_stats); exp->exp_nid_stats = old_stat; } else { - /* lustre_hash_findadd_unique() has added + /* cfs_hash_findadd_unique() has added * old_stat's refcount */ nidstat_putref(old_stat); } - spin_unlock(&obd->obd_nid_lock); + cfs_spin_unlock(&obd->obd_nid_lock); GOTO(destroy_new, rc = -EALREADY); } /* not found - create */ - new_stat->nid_proc = lprocfs_register(libcfs_nid2str(*nid), + OBD_ALLOC(buffer, LNET_NIDSTR_SIZE); + if (buffer == NULL) + GOTO(destroy_new, rc = -ENOMEM); + + memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE); + new_stat->nid_proc = lprocfs_register(buffer, obd->obd_proc_exports_entry, NULL, NULL); + OBD_FREE(buffer, LNET_NIDSTR_SIZE); + if (new_stat->nid_proc == NULL) { CERROR("Error making export directory for nid %s\n", libcfs_nid2str(*nid)); @@ -1835,16 +1835,16 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) exp->exp_nid_stats = new_stat; *newnid = 1; /* protect competitive add to list, not need locking on destroy */ - spin_lock(&obd->obd_nid_lock); - list_add(&new_stat->nid_list, &obd->obd_nid_stats); - spin_unlock(&obd->obd_nid_lock); + cfs_spin_lock(&obd->obd_nid_lock); + cfs_list_add(&new_stat->nid_list, &obd->obd_nid_stats); + cfs_spin_unlock(&obd->obd_nid_lock); RETURN(rc); destroy_new_ns: if (new_stat->nid_proc != NULL) lprocfs_remove(&new_stat->nid_proc); - lustre_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); + cfs_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); destroy_new: OBD_FREE_PTR(new_stat); @@ -1860,7 +1860,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp) nidstat_putref(exp->exp_nid_stats); exp->exp_nid_stats = NULL; - lprocfs_free_md_stats(exp->exp_obd); return 0; } @@ -1879,7 +1878,7 @@ int lprocfs_write_frac_helper(const char *buffer, unsigned long count, if (count > (sizeof(kernbuf) - 1)) return -EINVAL; - if (copy_from_user(kernbuf, buffer, count)) + if (cfs_copy_from_user(kernbuf, buffer, count)) return -EFAULT; kernbuf[count] = '\0'; @@ -1982,7 +1981,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, if (count > (sizeof(kernbuf) - 1)) return -EINVAL; - if (copy_from_user(kernbuf, buffer, count)) + if (cfs_copy_from_user(kernbuf, buffer, count)) return -EFAULT; kernbuf[count] = '\0'; @@ -2064,9 +2063,9 @@ void lprocfs_oh_tally(struct obd_histogram *oh, unsigned int value) if (value >= OBD_HIST_MAX) value = OBD_HIST_MAX - 1; - spin_lock(&oh->oh_lock); + cfs_spin_lock(&oh->oh_lock); oh->oh_buckets[value]++; - spin_unlock(&oh->oh_lock); + cfs_spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_tally); @@ -2094,9 +2093,9 @@ EXPORT_SYMBOL(lprocfs_oh_sum); void lprocfs_oh_clear(struct obd_histogram *oh) { - spin_lock(&oh->oh_lock); + cfs_spin_lock(&oh->oh_lock); memset(oh->oh_buckets, 0, sizeof(oh->oh_buckets)); - spin_unlock(&oh->oh_lock); + cfs_spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_clear); @@ -2109,10 +2108,10 @@ int lprocfs_obd_rd_hash(char *page, char **start, off_t off, if (obd == NULL) return 0; - c += lustre_hash_debug_header(page, count); - c += lustre_hash_debug_str(obd->obd_uuid_hash, page + c, count - c); - c += lustre_hash_debug_str(obd->obd_nid_hash, page + c, count - c); - c += lustre_hash_debug_str(obd->obd_nid_stats_hash, page+c, count-c); + c += cfs_hash_debug_header(page, count); + c += cfs_hash_debug_str(obd->obd_uuid_hash, page + c, count - c); + c += cfs_hash_debug_str(obd->obd_nid_hash, page + c, count - c); + c += cfs_hash_debug_str(obd->obd_nid_stats_hash, page+c, count-c); return c; } @@ -2200,14 +2199,17 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, goto out; /* Number of clients that have completed recovery */ if (lprocfs_obd_snprintf(&page, size, &len,"req_replay_clients: %d\n", - atomic_read(&obd->obd_req_replay_clients))<= 0) + cfs_atomic_read(&obd->obd_req_replay_clients)) + <= 0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"lock_repay_clients: %d\n", - atomic_read(&obd->obd_lock_replay_clients))<=0) + cfs_atomic_read(&obd->obd_lock_replay_clients)) + <=0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"completed_clients: %d\n", obd->obd_connected_clients - - atomic_read(&obd->obd_lock_replay_clients))<=0) + cfs_atomic_read(&obd->obd_lock_replay_clients)) + <=0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"evicted_clients: %d\n", obd->obd_stale_clients) <= 0) @@ -2276,6 +2278,7 @@ EXPORT_SYMBOL(lprocfs_init_ldlm_stats); EXPORT_SYMBOL(lprocfs_alloc_obd_stats); EXPORT_SYMBOL(lprocfs_alloc_md_stats); EXPORT_SYMBOL(lprocfs_free_obd_stats); +EXPORT_SYMBOL(lprocfs_free_md_stats); EXPORT_SYMBOL(lprocfs_exp_setup); EXPORT_SYMBOL(lprocfs_exp_cleanup); @@ -2301,8 +2304,6 @@ EXPORT_SYMBOL(lprocfs_rd_kbytesfree); EXPORT_SYMBOL(lprocfs_rd_kbytesavail); EXPORT_SYMBOL(lprocfs_rd_filestotal); EXPORT_SYMBOL(lprocfs_rd_filesfree); -EXPORT_SYMBOL(lprocfs_rd_quota_resend_count); -EXPORT_SYMBOL(lprocfs_wr_quota_resend_count); EXPORT_SYMBOL(lprocfs_write_helper); EXPORT_SYMBOL(lprocfs_write_frac_helper);