diff options
| author | Al Viro | 2013-09-12 23:54:48 +0200 |
|---|---|---|
| committer | Al Viro | 2013-09-12 23:54:48 +0200 |
| commit | bf2ba3bc185269eca274b458aac46ba1ad7c1121 (patch) | |
| tree | 2cdaf7568df3ab762f42e7849fc9211dcb60d1bc /kernel | |
| parent | Add missing unlocks to error paths of mountpoint_last. (diff) | |
| parent | super: fix for destroy lrus (diff) | |
| download | kernel-qcow2-linux-bf2ba3bc185269eca274b458aac46ba1ad7c1121.tar.gz kernel-qcow2-linux-bf2ba3bc185269eca274b458aac46ba1ad7c1121.tar.xz kernel-qcow2-linux-bf2ba3bc185269eca274b458aac46ba1ad7c1121.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 07f6fc468e17..7822cd88a95c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1471,14 +1471,14 @@ static struct ctl_table fs_table[] = { { .procname = "inode-nr", .data = &inodes_stat, - .maxlen = 2*sizeof(int), + .maxlen = 2*sizeof(long), .mode = 0444, .proc_handler = proc_nr_inodes, }, { .procname = "inode-state", .data = &inodes_stat, - .maxlen = 7*sizeof(int), + .maxlen = 7*sizeof(long), .mode = 0444, .proc_handler = proc_nr_inodes, }, @@ -1508,7 +1508,7 @@ static struct ctl_table fs_table[] = { { .procname = "dentry-state", .data = &dentry_stat, - .maxlen = 6*sizeof(int), + .maxlen = 6*sizeof(long), .mode = 0444, .proc_handler = proc_nr_dentry, }, |