summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2005-09-06 15:17:38 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:32 -0700
commit2832e9366a1fcd6f76957a42157be041240f994e (patch)
treed2dd2a46f3ba7476b7db31806b5d98c4ed6a46dd
parent0730ded5be28653675ed314fdd878b8db5f88aa4 (diff)
downloadop-kernel-dev-2832e9366a1fcd6f76957a42157be041240f994e.zip
op-kernel-dev-2832e9366a1fcd6f76957a42157be041240f994e.tar.gz
[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>
-rw-r--r--fs/file_table.c1
-rw-r--r--fs/read_write.c2
-rw-r--r--include/linux/fs.h1
3 files changed, 1 insertions, 3 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 1d3de78..43e9e17 100644
--- 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 563abd0..b60324a 100644
--- 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 67e6732..2036747 100644
--- 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;
OpenPOWER on IntegriCloud