diff options
author | Theodore Ts'o <tytso@mit.edu> | 2009-03-31 09:11:14 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-03-31 09:11:14 -0400 |
commit | b713a5ec55bf73c833f9883cdd761b20ee61a1ab (patch) | |
tree | 77bbc689f442cad3ce8ca21d7b2c7cea2738d519 /fs/ext4/super.c | |
parent | 3197ebdb130473a92760100cbfe0d7e671838f48 (diff) |
ext4: remove /proc tuning knobs
Remove tuning knobs in /proc/fs/ext4/<dev/* since they have been
replaced by knobs in sysfs at /sys/fs/ext4/<dev>/*.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2883d4318c22..1ec554cc107a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -579,7 +579,6 @@ static void ext4_put_super(struct super_block *sb) | |||
579 | ext4_commit_super(sb, es, 1); | 579 | ext4_commit_super(sb, es, 1); |
580 | } | 580 | } |
581 | if (sbi->s_proc) { | 581 | if (sbi->s_proc) { |
582 | remove_proc_entry("inode_readahead_blks", sbi->s_proc); | ||
583 | remove_proc_entry(sb->s_id, ext4_proc_root); | 582 | remove_proc_entry(sb->s_id, ext4_proc_root); |
584 | } | 583 | } |
585 | kobject_del(&sbi->s_kobj); | 584 | kobject_del(&sbi->s_kobj); |
@@ -2529,11 +2528,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
2529 | #ifdef CONFIG_PROC_FS | 2528 | #ifdef CONFIG_PROC_FS |
2530 | if (ext4_proc_root) | 2529 | if (ext4_proc_root) |
2531 | sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root); | 2530 | sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root); |
2532 | |||
2533 | if (sbi->s_proc) | ||
2534 | proc_create_data("inode_readahead_blks", 0644, sbi->s_proc, | ||
2535 | &ext4_ui_proc_fops, | ||
2536 | &sbi->s_inode_readahead_blks); | ||
2537 | #endif | 2531 | #endif |
2538 | 2532 | ||
2539 | bgl_lock_init(sbi->s_blockgroup_lock); | 2533 | bgl_lock_init(sbi->s_blockgroup_lock); |
@@ -2832,7 +2826,6 @@ failed_mount2: | |||
2832 | kfree(sbi->s_group_desc); | 2826 | kfree(sbi->s_group_desc); |
2833 | failed_mount: | 2827 | failed_mount: |
2834 | if (sbi->s_proc) { | 2828 | if (sbi->s_proc) { |
2835 | remove_proc_entry("inode_readahead_blks", sbi->s_proc); | ||
2836 | remove_proc_entry(sb->s_id, ext4_proc_root); | 2829 | remove_proc_entry(sb->s_id, ext4_proc_root); |
2837 | } | 2830 | } |
2838 | #ifdef CONFIG_QUOTA | 2831 | #ifdef CONFIG_QUOTA |
@@ -3865,45 +3858,6 @@ static int ext4_get_sb(struct file_system_type *fs_type, | |||
3865 | return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super, mnt); | 3858 | return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super, mnt); |
3866 | } | 3859 | } |
3867 | 3860 | ||
3868 | #ifdef CONFIG_PROC_FS | ||
3869 | static int ext4_ui_proc_show(struct seq_file *m, void *v) | ||
3870 | { | ||
3871 | unsigned int *p = m->private; | ||
3872 | |||
3873 | seq_printf(m, "%u\n", *p); | ||
3874 | return 0; | ||
3875 | } | ||
3876 | |||
3877 | static int ext4_ui_proc_open(struct inode *inode, struct file *file) | ||
3878 | { | ||
3879 | return single_open(file, ext4_ui_proc_show, PDE(inode)->data); | ||
3880 | } | ||
3881 | |||
3882 | static ssize_t ext4_ui_proc_write(struct file *file, const char __user *buf, | ||
3883 | size_t cnt, loff_t *ppos) | ||
3884 | { | ||
3885 | unsigned long *p = PDE(file->f_path.dentry->d_inode)->data; | ||
3886 | char str[32]; | ||
3887 | |||
3888 | if (cnt >= sizeof(str)) | ||
3889 | return -EINVAL; | ||
3890 | if (copy_from_user(str, buf, cnt)) | ||
3891 | return -EFAULT; | ||
3892 | |||
3893 | *p = simple_strtoul(str, NULL, 0); | ||
3894 | return cnt; | ||
3895 | } | ||
3896 | |||
3897 | const struct file_operations ext4_ui_proc_fops = { | ||
3898 | .owner = THIS_MODULE, | ||
3899 | .open = ext4_ui_proc_open, | ||
3900 | .read = seq_read, | ||
3901 | .llseek = seq_lseek, | ||
3902 | .release = single_release, | ||
3903 | .write = ext4_ui_proc_write, | ||
3904 | }; | ||
3905 | #endif | ||
3906 | |||
3907 | static struct file_system_type ext4_fs_type = { | 3861 | static struct file_system_type ext4_fs_type = { |
3908 | .owner = THIS_MODULE, | 3862 | .owner = THIS_MODULE, |
3909 | .name = "ext4", | 3863 | .name = "ext4", |