#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)
}
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;
}
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_current_64() - CFS_HZ,
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_current_64() - CFS_HZ,
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_current_64() - CFS_HZ,
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_current_64() - CFS_HZ,
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_current_64() - CFS_HZ,
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_current_64() - CFS_HZ,
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)
" 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);
" 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;
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)
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;
}
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);
}
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);
+ cfs_atomic_set(&new_stat->nid_exp_ref_count, 0);
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);
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));
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);
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';
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);
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_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