Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[~shefty/rdma-dev.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 48d9d689498fbaa394e4d6ec8f4403c90767d7f1..c33a1edb799fda6db2e16fdf9d1d0401a9f78278 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1338,14 +1338,14 @@ static struct ctl_table fs_table[] = {
                .data           = &inodes_stat,
                .maxlen         = 2*sizeof(int),
                .mode           = 0444,
                .data           = &inodes_stat,
                .maxlen         = 2*sizeof(int),
                .mode           = 0444,

-               .proc_handler   = proc_dointvec,
+               .proc_handler   = proc_nr_inodes,

        },
        {
                .procname       = "inode-state",
                .data           = &inodes_stat,
                .maxlen         = 7*sizeof(int),
                .mode           = 0444,
        },
        {
                .procname       = "inode-state",
                .data           = &inodes_stat,
                .maxlen         = 7*sizeof(int),
                .mode           = 0444,

-               .proc_handler   = proc_dointvec,
+               .proc_handler   = proc_nr_inodes,

        },
        {
                .procname       = "file-nr",
        },
        {
                .procname       = "file-nr",


@@ -1375,7 +1375,7 @@ static struct ctl_table fs_table[] = {
                .data           = &dentry_stat,
                .maxlen         = 6*sizeof(int),
                .mode           = 0444,
                .data           = &dentry_stat,
                .maxlen         = 6*sizeof(int),
                .mode           = 0444,

-               .proc_handler   = proc_dointvec,
+               .proc_handler   = proc_nr_dentry,

        },
        {
                .procname       = "overflowuid",
        },
        {
                .procname       = "overflowuid",