{
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
- long pages_number;
- int mult;
+ unsigned long ra_max_mb;
spin_lock(&sbi->ll_lock);
- pages_number = sbi->ll_ra_info.ra_max_pages;
+ ra_max_mb = PAGES_TO_MiB(sbi->ll_ra_info.ra_max_pages);
spin_unlock(&sbi->ll_lock);
- mult = 1 << (20 - PAGE_SHIFT);
- return lprocfs_seq_read_frac_helper(m, pages_number, mult);
+ seq_printf(m, "%lu\n", ra_max_mb);
+ return 0;
}
static ssize_t
struct seq_file *m = file->private_data;
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
- __s64 pages_number;
+ s64 ra_max_mb, pages_number;
int rc;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M');
+ rc = lprocfs_str_with_units_to_s64(buffer, count, &ra_max_mb, 'M');
if (rc)
return rc;
- pages_number >>= PAGE_SHIFT;
-
+ pages_number = round_up(ra_max_mb, 1024 * 1024) >> PAGE_SHIFT;
if (pages_number < 0 || pages_number > totalram_pages / 2) {
/* 1/2 of RAM */
- CERROR("%s: can't set max_readahead_mb=%lu > %luMB\n",
- sbi->ll_fsname,
- (unsigned long)pages_number >> (20 - PAGE_SHIFT),
- totalram_pages >> (20 - PAGE_SHIFT + 1));
+ CERROR("%s: can't set max_readahead_mb=%llu > %luMB\n",
+ sbi->ll_fsname, PAGES_TO_MiB(pages_number),
+ PAGES_TO_MiB(totalram_pages));
return -ERANGE;
}
{
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
- long pages_number;
- int mult;
+ unsigned long ra_max_file_mb;
spin_lock(&sbi->ll_lock);
- pages_number = sbi->ll_ra_info.ra_max_pages_per_file;
+ ra_max_file_mb = PAGES_TO_MiB(sbi->ll_ra_info.ra_max_pages_per_file);
spin_unlock(&sbi->ll_lock);
- mult = 1 << (20 - PAGE_SHIFT);
- return lprocfs_seq_read_frac_helper(m, pages_number, mult);
+ seq_printf(m, "%lu\n", ra_max_file_mb);
+ return 0;
}
static ssize_t
struct seq_file *m = file->private_data;
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
+ s64 ra_max_file_mb, pages_number;
int rc;
- __s64 pages_number;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M');
+ rc = lprocfs_str_with_units_to_s64(buffer, count, &ra_max_file_mb,
+ 'M');
if (rc)
return rc;
- pages_number >>= PAGE_SHIFT;
-
+ pages_number = round_up(ra_max_file_mb, 1024 * 1024) >> PAGE_SHIFT;
if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) {
- CERROR("%s: can't set max_readahead_per_file_mb=%lu > "
- "max_read_ahead_mb=%lu\n", sbi->ll_fsname,
- (unsigned long)pages_number >> (20 - PAGE_SHIFT),
- sbi->ll_ra_info.ra_max_pages >> (20 - PAGE_SHIFT));
+ CERROR("%s: can't set max_readahead_per_file_mb=%llu > max_read_ahead_mb=%lu\n",
+ sbi->ll_fsname, PAGES_TO_MiB(pages_number),
+ PAGES_TO_MiB(sbi->ll_ra_info.ra_max_pages));
return -ERANGE;
}
{
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
- long pages_number;
- int mult;
+ unsigned long ra_max_whole_mb;
spin_lock(&sbi->ll_lock);
- pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
+ ra_max_whole_mb = PAGES_TO_MiB(sbi->ll_ra_info.ra_max_read_ahead_whole_pages);
spin_unlock(&sbi->ll_lock);
- mult = 1 << (20 - PAGE_SHIFT);
- return lprocfs_seq_read_frac_helper(m, pages_number, mult);
+ seq_printf(m, "%lu\n", ra_max_whole_mb);
+ return 0;
}
static ssize_t
struct seq_file *m = file->private_data;
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
+ s64 ra_max_whole_mb, pages_number;
int rc;
- __s64 pages_number;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M');
+ rc = lprocfs_str_with_units_to_s64(buffer, count, &ra_max_whole_mb,
+ 'M');
if (rc)
return rc;
- pages_number >>= PAGE_SHIFT;
-
+ pages_number = round_up(ra_max_whole_mb, 1024 * 1024) >> PAGE_SHIFT;
/* Cap this at the current max readahead window size, the readahead
- * algorithm does this anyway so it's pointless to set it larger. */
+ * algorithm does this anyway so it's pointless to set it larger.
+ */
if (pages_number < 0 ||
pages_number > sbi->ll_ra_info.ra_max_pages_per_file) {
- int pages_shift = 20 - PAGE_SHIFT;
- CERROR("%s: can't set max_read_ahead_whole_mb=%lu > "
- "max_read_ahead_per_file_mb=%lu\n",
- sbi->ll_fsname,
- (unsigned long)pages_number >> pages_shift,
- sbi->ll_ra_info.ra_max_pages_per_file >> pages_shift);
+ CERROR("%s: can't set max_read_ahead_whole_mb=%llu > max_read_ahead_per_file_mb=%lu\n",
+ sbi->ll_fsname, PAGES_TO_MiB(pages_number),
+ PAGES_TO_MiB(sbi->ll_ra_info.ra_max_pages_per_file));
return -ERANGE;
}
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct cl_client_cache *cache = sbi->ll_cache;
- int shift = 20 - PAGE_SHIFT;
long max_cached_mb;
long unused_mb;
- max_cached_mb = cache->ccc_lru_max >> shift;
- unused_mb = atomic_long_read(&cache->ccc_lru_left) >> shift;
+ max_cached_mb = PAGES_TO_MiB(cache->ccc_lru_max);
+ unused_mb = PAGES_TO_MiB(atomic_long_read(&cache->ccc_lru_left));
seq_printf(m, "users: %d\n"
"max_cached_mb: %ld\n"
"used_mb: %ld\n"
if (pages_number < 0 || pages_number > totalram_pages) {
CERROR("%s: can't set max cache more than %lu MB\n",
sbi->ll_fsname,
- totalram_pages >> (20 - PAGE_SHIFT));
+ PAGES_TO_MiB(totalram_pages));
RETURN(-ERANGE);
}
/* Allow enough cache so clients can make well-formed RPCs */
}
EXPORT_SYMBOL(lprocfs_read_helper);
-int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val,
- int mult)
-{
- long decimal_val, frac_val;
- int prtn;
-
- if (count < 10)
- return -EINVAL;
-
- decimal_val = val / mult;
- prtn = snprintf(buffer, count, "%ld", decimal_val);
- frac_val = val % mult;
-
- if (prtn < (count - 4) && frac_val > 0) {
- long temp_frac;
- int i, temp_mult = 1, frac_bits = 0;
-
- temp_frac = frac_val * 10;
- buffer[prtn++] = '.';
- while (frac_bits < 2 && (temp_frac / mult) < 1) {
- /* only reserved 2 bits fraction */
- buffer[prtn++] = '0';
- temp_frac *= 10;
- frac_bits++;
- }
- /*
- * Need to think these cases :
- * 1. #echo x.00 > /proc/xxx output result : x
- * 2. #echo x.0x > /proc/xxx output result : x.0x
- * 3. #echo x.x0 > /proc/xxx output result : x.x
- * 4. #echo x.xx > /proc/xxx output result : x.xx
- * Only reserved 2 bits fraction.
- */
- for (i = 0; i < (5 - prtn); i++)
- temp_mult *= 10;
-
- frac_bits = min((int)count - prtn, 3 - frac_bits);
- prtn += snprintf(buffer + prtn, frac_bits, "%ld",
- frac_val * temp_mult / mult);
-
- prtn--;
- while (buffer[prtn] < '1' || buffer[prtn] > '9') {
- prtn--;
- if (buffer[prtn] == '.') {
- prtn--;
- break;
- }
- }
- prtn++;
- }
- buffer[prtn++] = '\n';
- return prtn;
-}
-EXPORT_SYMBOL(lprocfs_read_frac_helper);
-
-int lprocfs_seq_read_frac_helper(struct seq_file *m, long val, int mult)
-{
- long decimal_val, frac_val;
-
- decimal_val = val / mult;
- seq_printf(m, "%ld", decimal_val);
- frac_val = val % mult;
-
- if (frac_val > 0) {
- frac_val *= 100;
- frac_val /= mult;
- }
- if (frac_val > 0) {
- /* Three cases: x0, xx, 0x */
- if ((frac_val % 10) != 0)
- seq_printf(m, ".%ld", frac_val);
- else
- seq_printf(m, ".%ld", frac_val / 10);
- }
-
- seq_printf(m, "\n");
- return 0;
-}
-EXPORT_SYMBOL(lprocfs_seq_read_frac_helper);
-
/* Obtains the conversion factor for the unit specified */
static int get_mult(char unit, __u64 *mult)
{
{
struct obd_device *dev = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- long val;
- int mult;
+ struct client_obd *cli = &dev->u.cli;
+ unsigned long val;
spin_lock(&cli->cl_loi_list_lock);
- val = cli->cl_dirty_max_pages;
+ val = PAGES_TO_MiB(cli->cl_dirty_max_pages);
spin_unlock(&cli->cl_loi_list_lock);
- mult = 1 << (20 - PAGE_SHIFT);
- return lprocfs_read_frac_helper(buf, PAGE_SIZE, val, mult);
+ return sprintf(buf, "%lu\n", val);
}
static ssize_t max_dirty_mb_store(struct kobject *kobj,
struct obd_device *dev = container_of(kobj, struct obd_device,
obd_kset.kobj);
struct client_obd *cli = &dev->u.cli;
- unsigned long pages_number;
+ unsigned long pages_number, max_dirty_mb;
int rc;
- rc = kstrtoul(buffer, 10, &pages_number);
+ rc = kstrtoul(buffer, 10, &max_dirty_mb);
if (rc)
return rc;
- pages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */
+ pages_number = MiB_TO_PAGES(max_dirty_mb);
- if (pages_number <= 0 ||
- pages_number >= OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) ||
+ if (pages_number >= MiB_TO_PAGES(OSC_MAX_DIRTY_MB_MAX) ||
pages_number > totalram_pages / 4) /* 1/4 of RAM */
return -ERANGE;
git://git.whamcloud.com / fs / lustre-release.git / commitdiff