struct obd_device *obd = (struct obd_device *)data;
LASSERT(obd != NULL);
- LASSERT(obd->u.filter.fo_vfsmnt->mnt_devname);
+ LASSERT(obd->u.obt.obt_vfsmnt->mnt_devname);
*eof = 1;
return snprintf(page, count, "%s\n",
- obd->u.filter.fo_vfsmnt->mnt_devname);
+ obd->u.obt.obt_vfsmnt->mnt_devname);
}
static int lprocfs_filter_rd_last_id(char *page, char **start, off_t off,
struct filter_obd *filter = &obd->u.filter;
int retval = 0, rc, i;
- if (obd == NULL)
+ if (obd == NULL || !obd->obd_set_up || obd->obd_stopping)
return 0;
rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, 0));
if (rc < 0)
count -= rc;
retval += rc;
- for (i = FILTER_GROUP_MDS1_N_BASE + 1; i < filter->fo_group_count; i++) {
+ for (i = FID_SEQ_OST_MDT1; i < filter->fo_group_count; i++) {
rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, i));
if (rc < 0) {
retval = rc;
struct obd_device *obd = data;
int rc;
- rc = snprintf(page, count, "%u\n", obd->u.filter.fo_fmd_max_age / HZ);
+ rc = snprintf(page, count, "%u\n",
+ obd->u.filter.fo_fmd_max_age / CFS_HZ);
return rc;
}
if (val > 65536 || val < 1)
return -EINVAL;
- obd->u.filter.fo_fmd_max_age = val * HZ;
+ obd->u.filter.fo_fmd_max_age = val * CFS_HZ;
return count;
}
if (rc)
return rc;
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
obd->u.filter.fo_read_cache = val;
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return count;
}
if (rc)
return rc;
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
obd->u.filter.fo_writethrough_cache = val;
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return count;
}
if (rc)
return rc;
- spin_lock(&obd->obd_osfs_lock);
+ cfs_spin_lock(&obd->obd_osfs_lock);
obd->u.filter.fo_raid_degraded = !!val;
- spin_unlock(&obd->obd_osfs_lock);
+ cfs_spin_unlock(&obd->obd_osfs_lock);
return count;
}
{ "tot_pending", lprocfs_filter_rd_tot_pending, 0, 0 },
{ "tot_granted", lprocfs_filter_rd_tot_granted, 0, 0 },
{ "hash_stats", lprocfs_obd_rd_hash, 0, 0 },
- { "recovery_status", lprocfs_obd_rd_recovery_status, 0, 0 },
- { "recovery_maxtime", lprocfs_obd_rd_recovery_maxtime,
- lprocfs_obd_wr_recovery_maxtime, 0},
+ { "recovery_status", lprocfs_obd_rd_recovery_status, 0, 0 },
+ { "recovery_time_soft", lprocfs_obd_rd_recovery_time_soft,
+ lprocfs_obd_wr_recovery_time_soft, 0},
+ { "recovery_time_hard", lprocfs_obd_rd_recovery_time_hard,
+ lprocfs_obd_wr_recovery_time_hard, 0},
{ "evict_client", 0, lprocfs_wr_evict_client, 0,
&lprocfs_evict_client_fops},
{ "num_exports", lprocfs_rd_num_exports, 0, 0 },
struct timeval now;
/* this sampling races with updates */
- do_gettimeofday(&now);
+ cfs_gettimeofday(&now);
seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n",
now.tv_sec, now.tv_usec);
{
char title[24];
- sprintf(title, "I/O time (1/%ds)", HZ);
+ sprintf(title, "I/O time (1/%ds)", CFS_HZ);
display_brw_stats(seq, title, "ios",
&brw_stats->hist[BRW_R_IO_TIME],
&brw_stats->hist[BRW_W_IO_TIME], 1);