redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging/lustre/llite: move llite/max_read_ahead_per_file_mb to sysfs 

Move max_read_ahead_per_file_mb file from /proc/fs/lustre/llite/*
to /sys/fs/lustre/llite/*/

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Oleg Drokin 2015-05-21 15:31:45 -04:00 committed by Greg Kroah-Hartman
parent e1a1df5e88
commit 0e6c5a219a
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/lustre/lustre/llite/lproc_llite.c
View File

@ -267,10 +267,12 @@ static ssize_t max_read_ahead_mb_store(struct kobject *kobj,
}
LUSTRE_RW_ATTR(max_read_ahead_mb);
static int ll_max_readahead_per_file_mb_seq_show(struct seq_file *m, void *v)
static ssize_t max_read_ahead_per_file_mb_show(struct kobject *kobj,
struct attribute *attr,
char *buf)
{
struct super_block *sb = m->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
ll_kobj);
long pages_number;
int mult;
@ -279,24 +281,24 @@ static int ll_max_readahead_per_file_mb_seq_show(struct seq_file *m, void *v)
spin_unlock(&sbi->ll_lock);
mult = 1 << (20 - PAGE_CACHE_SHIFT);
return lprocfs_seq_read_frac_helper(m, pages_number, mult);
return lprocfs_read_frac_helper(buf, PAGE_SIZE, pages_number, mult);
}
static ssize_t ll_max_readahead_per_file_mb_seq_write(struct file *file,
const char __user *buffer,
size_t count, loff_t *off)
static ssize_t max_read_ahead_per_file_mb_store(struct kobject *kobj,
struct attribute *attr,
const char *buffer,
size_t count)
{
struct super_block *sb = ((struct seq_file *)file->private_data)->private;
struct ll_sb_info *sbi = ll_s2sbi(sb);
int mult, rc, pages_number;
struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
ll_kobj);
int rc;
unsigned long pages_number;
mult = 1 << (20 - PAGE_CACHE_SHIFT);
rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
rc = kstrtoul(buffer, 10, &pages_number);
if (rc)
return rc;
if (pages_number < 0 ||
pages_number > sbi->ll_ra_info.ra_max_pages) {
if (pages_number > sbi->ll_ra_info.ra_max_pages) {
CERROR("can't set file readahead more than max_read_ahead_mb %lu MB\n",
sbi->ll_ra_info.ra_max_pages);
return -ERANGE;
@ -308,7 +310,7 @@ static ssize_t ll_max_readahead_per_file_mb_seq_write(struct file *file,
return count;
}
LPROC_SEQ_FOPS(ll_max_readahead_per_file_mb);
LUSTRE_RW_ATTR(max_read_ahead_per_file_mb);
static int ll_max_read_ahead_whole_mb_seq_show(struct seq_file *m, void *unused)
{
@ -845,8 +847,6 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
/* { "mntpt_path", ll_rd_path, 0, 0 }, */
{ "site", &ll_site_stats_fops, NULL, 0 },
/* { "filegroups", lprocfs_rd_filegroups, 0, 0 }, */
{ "max_read_ahead_per_file_mb", &ll_max_readahead_per_file_mb_fops,
NULL },
{ "max_read_ahead_whole_mb", &ll_max_read_ahead_whole_mb_fops, NULL },
{ "max_cached_mb", &ll_max_cached_mb_fops, NULL },
{ "checksum_pages", &ll_checksum_fops, NULL },
@ -880,6 +880,7 @@ static struct attribute *llite_attrs[] = {
&lustre_attr_fstype.attr,
&lustre_attr_uuid.attr,
&lustre_attr_max_read_ahead_mb.attr,
&lustre_attr_max_read_ahead_per_file_mb.attr,
NULL,
};

6
drivers/staging/lustre/sysfs-fs-lustre
View File

@ -104,3 +104,9 @@ Contact: "Oleg Drokin" <oleg.drokin@intel.com>
Description:
Sets maximum number of megabytes in system memory to be
given to read-ahead cache.
What: /sys/fs/lustre/llite/<fsname>-<uuid>/max_read_ahead_per_file_mb
Date: May 2015
Contact: "Oleg Drokin" <oleg.drokin@intel.com>
Description:
Sets maximum number of megabytes to read-ahead for a single file