[PATCH] remove file.f_maxcount

struct file cleanup: f_maxcount has an unique value (INT_MAX).  Just use
the hard-wired value.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/file_table.c b/fs/file_table.c
index 1d3de78e6bc960ddeb2b4b42eed7815c64aca298..43e9e1737de2cb365c954afeddfb64ae0433779b 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -89,7 +89,6 @@ struct file *get_empty_filp(void)
        rwlock_init(&f->f_owner.lock);
        /* f->f_version: 0 */
        INIT_LIST_HEAD(&f->f_list);
-       f->f_maxcount = INT_MAX;
        return f;
 
 over:

diff --git a/fs/read_write.c b/fs/read_write.c
index 563abd09b5c84b882cbe6f47e56d05e80e5db4b6..b60324aaa2b6731d9ddedd67badaa7b5c9790a60 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -188,7 +188,7 @@ int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count
        struct inode *inode;
        loff_t pos;
 
-       if (unlikely(count > file->f_maxcount))
+       if (unlikely(count > INT_MAX))
                goto Einval;
        pos = *ppos;
        if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 67e6732d4fdc736ec39f4c57324e4d64064e063e..2036747c7d1f653d5ba71f48babdc51c17588c20 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -594,7 +594,6 @@ struct file {
        unsigned int            f_uid, f_gid;
        struct file_ra_state    f_ra;
 
-       size_t                  f_maxcount;
        unsigned long           f_version;
        void                    *f_security;