* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#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)
}
EXPORT_SYMBOL(lprocfs_seq_release);
-struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head,
- const char *name)
+static struct proc_dir_entry *__lprocfs_srch(struct proc_dir_entry *head,
+ const char *name)
{
struct proc_dir_entry *temp;
if (head == NULL)
return NULL;
- LPROCFS_ENTRY();
temp = head->subdir;
while (temp != NULL) {
if (strcmp(temp->name, name) == 0) {
- LPROCFS_EXIT();
return temp;
}
temp = temp->next;
}
- LPROCFS_EXIT();
return NULL;
}
+struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head,
+ const char *name)
+{
+ struct proc_dir_entry *temp;
+
+ LPROCFS_ENTRY();
+ temp = __lprocfs_srch(head, name);
+ LPROCFS_EXIT();
+ return temp;
+}
+
/* lprocfs API calls */
/* Function that emulates snprintf but also has the side effect of advancing
mode |= 0200;
if (fops)
mode = 0644;
+ LPROCFS_WRITE_ENTRY();
proc = create_proc_entry(name, mode, root);
if (!proc) {
CERROR("LprocFS: No memory to create /proc entry %s", name);
+ LPROCFS_WRITE_EXIT();
return ERR_PTR(-ENOMEM);
}
proc->read_proc = read_proc;
proc->data = data;
if (fops)
proc->proc_fops = fops;
+ LPROCFS_WRITE_EXIT();
return proc;
}
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;
}
if (page == NULL)
return -ENOMEM;
- if (LPROCFS_ENTRY_AND_CHECK(dp))
- return -ENOENT;
+ if (LPROCFS_ENTRY_AND_CHECK(dp)) {
+ rc = -ENOENT;
+ goto out;
+ }
OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10);
if (dp->read_proc)
}
count = (rc < size) ? rc : size;
- if (copy_to_user(buf, start, count)) {
+ if (cfs_copy_to_user(buf, start, count)) {
rc = -EFAULT;
goto out;
}
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;
}
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;
}
int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list,
void *data)
{
+ int rc = 0;
+
if (root == NULL || list == NULL)
return -EINVAL;
+ LPROCFS_WRITE_ENTRY();
while (list->name != NULL) {
struct proc_dir_entry *cur_root, *proc;
char *pathcopy, *cur, *next, pathbuf[64];
if (strlen(list->name) > sizeof(pathbuf) - 1) {
OBD_ALLOC(pathcopy, pathsize);
if (pathcopy == NULL)
- return -ENOMEM;
+ GOTO(out, rc = -ENOMEM);
} else {
pathcopy = pathbuf;
}
if (*cur =='\0') /* skip double/trailing "/" */
continue;
- proc = lprocfs_srch(cur_root, cur);
+ proc = __lprocfs_srch(cur_root, cur);
CDEBUG(D_OTHER, "cur_root=%s, cur=%s, next=%s, (%s)\n",
cur_root->name, cur, next,
(proc ? "exists" : "new"));
if (cur_root == NULL || proc == NULL) {
CERROR("LprocFS: No memory to create /proc entry %s",
list->name);
- return -ENOMEM;
+ GOTO(out, rc = -ENOMEM);
}
if (list->fops)
proc->data = (list->data ? list->data : data);
list++;
}
- return 0;
+out:
+ LPROCFS_WRITE_EXIT();
+ return rc;
}
void lprocfs_remove(struct proc_dir_entry **rooth)
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);
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;
if (val <= 0)
return -ERANGE;
- atomic_set(atm, val);
+ cfs_atomic_set(atm, val);
return 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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
*eof = 1;
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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
__u32 blk_size = osfs.os_bsize >> 10;
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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
__u32 blk_size = osfs.os_bsize >> 10;
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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
__u32 blk_size = osfs.os_bsize >> 10;
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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
*eof = 1;
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_shift_64(-OBD_STATFS_CACHE_SECONDS),
OBD_STATFS_NODELAY);
if (!rc) {
*eof = 1;
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)
flag2str(deactive);
flag2str(replayable);
flag2str(pingable);
- flag2str(recon_bk);
- flag2str(last_recon);
return len;
}
#undef flags2str
"truncate_lock",
"initial_transno",
"inode_bit_locks",
- "join_file",
+ "join_file(obsolete)",
"getattr_by_fid",
"no_oh_for_devices",
- "local_client",
"remote_client",
+ "remote_client_by_force",
"max_byte_per_rpc",
"64bit_qdata",
"mds_capability",
"pools",
"grant_shrink",
"skip_orphan",
+ "large_ea",
+ "full20",
+ "layout_lock",
NULL
};
struct lprocfs_counter ret;
struct obd_device *obd = (struct obd_device *)data;
struct obd_import *imp;
+ struct obd_import_conn *conn;
int i, j, k, rw = 0;
LASSERT(obd != NULL);
"import:\n"
" name: %s\n"
" target: %s\n"
- " current_connection: %s\n"
" state: %s\n"
" connect_flags: [",
obd->obd_name,
obd2cli_tgt(obd),
- imp->imp_connection->c_remote_uuid.uuid,
ptlrpc_import_state_name(imp->imp_state));
i += obd_connect_flags2str(page + i, count - i,
imp->imp_connect_data.ocd_connect_flags,
i += snprintf(page + i, count - i,
"]\n"
" connection:\n"
+ " failover_nids: [");
+ cfs_spin_lock(&imp->imp_lock);
+ j = 0;
+ cfs_list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
+ i += snprintf(page + i, count - i, "%s%s", j ? ", " : "",
+ libcfs_nid2str(conn->oic_conn->c_peer.nid));
+ j++;
+ }
+ cfs_spin_unlock(&imp->imp_lock);
+ i += snprintf(page + i, count - i,
+ "]\n"
+ " current_connection: %s\n"
" connection_attempts: %u\n"
" generation: %u\n"
" in-progress_invalidations: %u\n",
+ libcfs_nid2str(imp->imp_connection->c_peer.nid),
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);
+ if (ret.lc_count != 0) {
+ /* first argument to do_div MUST be __u64 */
+ __u64 sum = ret.lc_sum;
+ do_div(sum, ret.lc_count);
+ ret.lc_sum = sum;
+ } else
+ ret.lc_sum = 0;
i += snprintf(page + i, count - i,
" rpcs:\n"
" inflight: %u\n"
" 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;
lprocfs_stats_collect(obd->obd_svc_stats,
PTLRPC_LAST_CNTR + BRW_READ_BYTES + rw,
&ret);
- if (ret.lc_sum > 0) {
- do_div(ret.lc_sum, ret.lc_count);
+ if (ret.lc_sum > 0 && ret.lc_count > 0) {
+ /* first argument to do_div MUST be __u64 */
+ __u64 sum = ret.lc_sum;
+ do_div(sum, ret.lc_count);
+ ret.lc_sum = sum;
i += snprintf(page + i, count - i,
" %s_data_averages:\n"
" bytes_per_rpc: "LPU64"\n",
k = (int)ret.lc_sum;
j = opcode_offset(OST_READ + rw) + EXTRA_MAX_OPCODES;
lprocfs_stats_collect(obd->obd_svc_stats, j, &ret);
- if (ret.lc_sum > 0) {
- do_div(ret.lc_sum, ret.lc_count);
+ if (ret.lc_sum > 0 && ret.lc_count != 0) {
+ /* first argument to do_div MUST be __u64 */
+ __u64 sum = ret.lc_sum;
+ do_div(sum, ret.lc_count);
+ ret.lc_sum = sum;
i += snprintf(page + i, count - i,
" %s_per_rpc: "LPU64"\n",
ret.lc_units, ret.lc_sum);
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)
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);
/* 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);
}
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)
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;
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);
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]));
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);
}
}
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)
struct proc_dir_entry *entry;
LASSERT(root != NULL);
+ LPROCFS_WRITE_ENTRY();
entry = create_proc_entry(name, 0644, root);
+ if (entry) {
+ entry->proc_fops = &lprocfs_stats_seq_fops;
+ entry->data = stats;
+ }
+
+ LPROCFS_WRITE_EXIT();
+
if (entry == NULL)
return -ENOMEM;
- entry->proc_fops = &lprocfs_stats_seq_fops;
- entry->data = stats;
+
return 0;
}
LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd);
- LPROCFS_OBD_OP_INIT(num_private_stats, stats, checkmd);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, preallocate);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, precreate);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, create);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, enqueue);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, change_cbdata);
+ LPROCFS_OBD_OP_INIT(num_private_stats, stats, find_cbdata);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, cancel);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, cancel_unused);
LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
lprocfs_counter_init(stats, coffset, 0, #op, "reqs"); \
} while (0)
-int lprocfs_alloc_md_stats(struct obd_device *obd,
- unsigned num_private_stats)
+void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats)
{
- struct lprocfs_stats *stats;
- unsigned int num_stats;
- int rc, i;
-
- LASSERT(obd->md_stats == NULL);
- LASSERT(obd->obd_proc_entry != NULL);
- LASSERT(obd->md_cntr_base == 0);
-
- num_stats = 1 + MD_COUNTER_OFFSET(revalidate_lock) +
- num_private_stats;
- stats = lprocfs_alloc_stats(num_stats, 0);
- if (stats == NULL)
- return -ENOMEM;
-
LPROCFS_MD_OP_INIT(num_private_stats, stats, getstatus);
LPROCFS_MD_OP_INIT(num_private_stats, stats, change_cbdata);
+ LPROCFS_MD_OP_INIT(num_private_stats, stats, find_cbdata);
LPROCFS_MD_OP_INIT(num_private_stats, stats, close);
LPROCFS_MD_OP_INIT(num_private_stats, stats, create);
LPROCFS_MD_OP_INIT(num_private_stats, stats, done_writing);
LPROCFS_MD_OP_INIT(num_private_stats, stats, get_remote_perm);
LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_getattr_async);
LPROCFS_MD_OP_INIT(num_private_stats, stats, revalidate_lock);
+}
+
+int lprocfs_alloc_md_stats(struct obd_device *obd,
+ unsigned num_private_stats)
+{
+ struct lprocfs_stats *stats;
+ unsigned int num_stats;
+ int rc, i;
+
+ LASSERT(obd->md_stats == NULL);
+ LASSERT(obd->obd_proc_entry != NULL);
+ LASSERT(obd->md_cntr_base == 0);
+
+ num_stats = 1 + MD_COUNTER_OFFSET(revalidate_lock) +
+ num_private_stats;
+ stats = lprocfs_alloc_stats(num_stats, 0);
+ if (stats == NULL)
+ return -ENOMEM;
+
+ lprocfs_init_mps_stats(num_private_stats, stats);
for (i = num_private_stats; i < num_stats; i++) {
if (stats->ls_percpu[0]->lp_cntr[i].lc_name == NULL) {
cb_data->len = len;
}
-void lprocfs_exp_print_uuid(void *obj, void *cb_data)
+int lprocfs_exp_print_uuid(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+ cfs_hlist_node_t *hnode, void *cb_data)
+
{
- struct obd_export *exp = (struct obd_export *)obj;
+ struct obd_export *exp = cfs_hash_object(hs, hnode);
struct exp_uuid_cb_data *data = (struct exp_uuid_cb_data *)cb_data;
if (exp->exp_nid_stats)
*data->len += snprintf((data->page + *data->len),
data->count, "%s\n",
obd_uuid2str(&exp->exp_client_uuid));
+ return 0;
}
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);
}
-void lprocfs_exp_print_hash(void *obj, void *cb_data)
+int lprocfs_exp_print_hash(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+ cfs_hlist_node_t *hnode, void *cb_data)
+
{
struct exp_uuid_cb_data *data = cb_data;
- struct obd_export *exp = obj;
- lustre_hash_t *lh;
+ struct obd_export *exp = cfs_hash_object(hs, hnode);
- lh = exp->exp_lock_hash;
- if (lh) {
- if (!*data->len)
- *data->len += lustre_hash_debug_header(data->page,
- data->count);
-
- *data->len += lustre_hash_debug_str(lh, data->page + *data->len,
- data->count);
+ if (exp->exp_lock_hash != NULL) {
+ if (!*data->len) {
+ *data->len += cfs_hash_debug_header(data->page,
+ data->count);
+ }
+ *data->len += cfs_hash_debug_str(hs, data->page + *data->len,
+ data->count);
}
+
+ return 0;
}
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);
}
}
EXPORT_SYMBOL(lprocfs_nid_stats_clear_read);
-void lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
+int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
{
struct nid_stat *stat = obj;
int i;
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);
- 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);
- EXIT;
- return;
+
+ CDEBUG(D_INFO,"refcnt %d\n", cfs_atomic_read(&stat->nid_exp_ref_count));
+ if (cfs_atomic_read(&stat->nid_exp_ref_count) == 1) {
+ /* object has only hash references. */
+ 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);
+ RETURN(1);
}
/* we has reference to object - only clear data*/
if (stat->nid_stats)
for (i = 0; i < BRW_LAST; i++)
lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]);
}
- EXIT;
- return;
+ RETURN(0);
}
int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer,
- unsigned long count, void *data)
+ unsigned long count, void *data)
{
struct obd_device *obd = (struct obd_device *)data;
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_cond_del(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);
}
}
EXPORT_SYMBOL(lprocfs_nid_stats_clear_write);
-int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid)
+int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int reconnect,
+ 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;
new_stat->nid = *nid;
new_stat->nid_obd = exp->exp_obd;
- atomic_set(&new_stat->nid_exp_ref_count, 0);
+ /* we need set default refcount to 1 to balance obd_disconnect */
+ cfs_atomic_set(&new_stat->nid_exp_ref_count, 1);
- 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);
- 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
- * old_stat's refcount */
+ /* if this connects to the existing export of same nid,
+ * we need to release old stats for obd_disconnect won't
+ * balance the reference gotten in "cfs_hash_findadd_uinque" */
+ if (reconnect && exp->exp_nid_stats)
nidstat_putref(old_stat);
- }
-
- spin_unlock(&obd->obd_nid_lock);
+ exp->exp_nid_stats = old_stat;
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));
GOTO(destroy_new_ns, rc);
}
- if (exp->exp_nid_stats)
- nidstat_putref(exp->exp_nid_stats);
- nidstat_getref(new_stat);
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:
+ nidstat_putref(new_stat);
OBD_FREE_PTR(new_stat);
RETURN(rc);
}
nidstat_putref(exp->exp_nid_stats);
exp->exp_nid_stats = NULL;
- lprocfs_free_md_stats(exp->exp_obd);
return 0;
}
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';
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';
struct proc_dir_entry *entry;
ENTRY;
+ LPROCFS_WRITE_ENTRY();
entry = create_proc_entry(name, mode, parent);
+ if (entry) {
+ entry->proc_fops = seq_fops;
+ entry->data = data;
+ }
+ LPROCFS_WRITE_EXIT();
+
if (entry == NULL)
RETURN(-ENOMEM);
- entry->proc_fops = seq_fops;
- entry->data = data;
RETURN(0);
}
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);
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);
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);
+#ifdef HAVE_QUOTA_SUPPORT
+ if (obd->u.obt.obt_qctxt.lqc_lqs_hash)
+ c += cfs_hash_debug_str(obd->u.obt.obt_qctxt.lqc_lqs_hash,
+ page + c, count - c);
+#endif
return c;
}
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)
}
EXPORT_SYMBOL(lprocfs_obd_rd_recovery_status);
-int lprocfs_obd_rd_recovery_maxtime(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+int lprocfs_obd_rd_recovery_time_soft(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct obd_device *obd = (struct obd_device *)data;
+ LASSERT(obd != NULL);
+
+ return snprintf(page, count, "%d\n",
+ obd->obd_recovery_timeout);
+}
+EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_soft);
+
+int lprocfs_obd_wr_recovery_time_soft(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ struct obd_device *obd = (struct obd_device *)data;
+ int val, rc;
+ LASSERT(obd != NULL);
+
+ rc = lprocfs_write_helper(buffer, count, &val);
+ if (rc)
+ return rc;
+
+ obd->obd_recovery_timeout = val;
+ return count;
+}
+EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_soft);
+
+int lprocfs_obd_rd_recovery_time_hard(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
{
struct obd_device *obd = data;
LASSERT(obd != NULL);
- return snprintf(page, count, "%lu\n", obd->obd_recovery_max_time);
+ return snprintf(page, count, "%lu\n", obd->obd_recovery_time_hard);
}
-EXPORT_SYMBOL(lprocfs_obd_rd_recovery_maxtime);
+EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_hard);
-int lprocfs_obd_wr_recovery_maxtime(struct file *file, const char *buffer,
- unsigned long count, void *data)
+int lprocfs_obd_wr_recovery_time_hard(struct file *file, const char *buffer,
+ unsigned long count, void *data)
{
struct obd_device *obd = data;
int val, rc;
if (rc)
return rc;
- obd->obd_recovery_max_time = val;
+ obd->obd_recovery_time_hard = val;
return count;
}
-EXPORT_SYMBOL(lprocfs_obd_wr_recovery_maxtime);
+EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_hard);
+
+int lprocfs_obd_rd_mntdev(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct obd_device *obd = (struct obd_device *)data;
+ LASSERT(obd != NULL);
+ LASSERT(obd->u.obt.obt_vfsmnt->mnt_devname);
+ *eof = 1;
+ return snprintf(page, count, "%s\n",
+ obd->u.obt.obt_vfsmnt->mnt_devname);
+}
+EXPORT_SYMBOL(lprocfs_obd_rd_mntdev);
EXPORT_SYMBOL(lprocfs_register);
EXPORT_SYMBOL(lprocfs_srch);
EXPORT_SYMBOL(lprocfs_clear_stats);
EXPORT_SYMBOL(lprocfs_register_stats);
EXPORT_SYMBOL(lprocfs_init_ops_stats);
+EXPORT_SYMBOL(lprocfs_init_mps_stats);
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);
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);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff