7 files changed, 27 insertions, 27 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index 4d9df3c940e6..6ef1c2e1bbc4 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -146,13 +146,13 @@ struct dentry_stat_t dentry_stat = {
         .age_limit = 45,
 };
 
-static DEFINE_PER_CPU(unsigned int, nr_dentry);
+static DEFINE_PER_CPU(long, nr_dentry);
 
 #if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
-static int get_nr_dentry(void)
+static long get_nr_dentry(void)
 {
         int i;
-        int sum = 0;
+        long sum = 0;
         for_each_possible_cpu(i)
                 sum += per_cpu(nr_dentry, i);
         return sum < 0 ? 0 : sum;
@@ -162,7 +162,7 @@ int proc_nr_dentry(ctl_table *table, int write, void __user *buffer,
                    size_t *lenp, loff_t *ppos)
 {
         dentry_stat.nr_dentry = get_nr_dentry();
-        return proc_dointvec(table, write, buffer, lenp, ppos);
+        return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 }
 #endif
 
diff --git a/fs/inode.c b/fs/inode.c
index 93a0625b46e4..2a3c37ea823d 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -70,33 +70,33 @@ EXPORT_SYMBOL(empty_aops);
  */
 struct inodes_stat_t inodes_stat;
 
-static DEFINE_PER_CPU(unsigned int, nr_inodes);
-static DEFINE_PER_CPU(unsigned int, nr_unused);
+static DEFINE_PER_CPU(unsigned long, nr_inodes);
+static DEFINE_PER_CPU(unsigned long, nr_unused);
 
 static struct kmem_cache *inode_cachep __read_mostly;
 
-static int get_nr_inodes(void)
+static long get_nr_inodes(void)
 {
         int i;
-        int sum = 0;
+        long sum = 0;
         for_each_possible_cpu(i)
                 sum += per_cpu(nr_inodes, i);
         return sum < 0 ? 0 : sum;
 }
 
-static inline int get_nr_inodes_unused(void)
+static inline long get_nr_inodes_unused(void)
 {
         int i;
-        int sum = 0;
+        long sum = 0;
         for_each_possible_cpu(i)
                 sum += per_cpu(nr_unused, i);
         return sum < 0 ? 0 : sum;
 }
 
-int get_nr_dirty_inodes(void)
+long get_nr_dirty_inodes(void)
 {
         /* not actually dirty inodes, but a wild approximation */
-        int nr_dirty = get_nr_inodes() - get_nr_inodes_unused();
+        long nr_dirty = get_nr_inodes() - get_nr_inodes_unused();
         return nr_dirty > 0 ? nr_dirty : 0;
 }
 
@@ -109,7 +109,7 @@ int proc_nr_inodes(ctl_table *table, int write,
 {
         inodes_stat.nr_inodes = get_nr_inodes();
         inodes_stat.nr_unused = get_nr_inodes_unused();
-        return proc_dointvec(table, write, buffer, lenp, ppos);
+        return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 }
 #endif
 
diff --git a/fs/internal.h b/fs/internal.h
index 2be46ea5dd0b..b6495659d6e8 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -121,7 +121,7 @@ extern void inode_add_lru(struct inode *inode);
  */
 extern void inode_wb_list_del(struct inode *inode);
 
-extern int get_nr_dirty_inodes(void);
+extern long get_nr_dirty_inodes(void);
 extern void evict_inodes(struct super_block *);
 extern int invalidate_inodes(struct super_block *, bool);
 
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index feaa8d88eef7..844a1ef387e4 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -55,11 +55,11 @@ struct qstr {
 #define hashlen_len(hashlen)  ((u32)((hashlen) >> 32))
 
 struct dentry_stat_t {
-        int nr_dentry;
-        int nr_unused;
-        int age_limit;          /* age in seconds */
-        int want_pages;         /* pages requested by system */
-        int dummy[2];
+        long nr_dentry;
+        long nr_unused;
+        long age_limit;          /* age in seconds */
+        long want_pages;         /* pages requested by system */
+        long dummy[2];
 };
 extern struct dentry_stat_t dentry_stat;
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 49e71b0f0e9f..3b3edac75df2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1271,12 +1271,12 @@ struct super_block {
         struct list_head        s_mounts;       /* list of mounts; _not_ for fs use */
         /* s_dentry_lru, s_nr_dentry_unused protected by dcache.c lru locks */
         struct list_head        s_dentry_lru;   /* unused dentry lru */
-        int                     s_nr_dentry_unused;     /* # of dentry on lru */
+        long                    s_nr_dentry_unused;     /* # of dentry on lru */
 
         /* s_inode_lru_lock protects s_inode_lru and s_nr_inodes_unused */
         spinlock_t              s_inode_lru_lock ____cacheline_aligned_in_smp;
         struct list_head        s_inode_lru;            /* unused inode lru */
-        int                     s_nr_inodes_unused;     /* # of inodes on lru */
+        long                    s_nr_inodes_unused;     /* # of inodes on lru */
 
         struct block_device     *s_bdev;
         struct backing_dev_info *s_bdi;
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index a4ed56cf0eac..6c28b61bb690 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -49,9 +49,9 @@ struct files_stat_struct {
 };
 
 struct inodes_stat_t {
-        int nr_inodes;
-        int nr_unused;
-        int dummy[5];           /* padding for sysctl ABI compatibility */
+        long nr_inodes;
+        long nr_unused;
+        long dummy[5];          /* padding for sysctl ABI compatibility */
 };
 
 
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,
         },