summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-08-21 14:32:48 -0400
committerJames Morris <jmorris@namei.org>2009-08-24 14:58:23 +1000
commit6777d773a463ac045d333b989d4e44660f8d92ad (patch)
tree17291984d71515cec0a1970ecce3d631ed2f7981 /fs
parent3edf2fb9d80a46d6c32ba12547a42419845b4b76 (diff)
downloadlinux-3.10-6777d773a463ac045d333b989d4e44660f8d92ad.tar.gz
linux-3.10-6777d773a463ac045d333b989d4e44660f8d92ad.tar.bz2
linux-3.10-6777d773a463ac045d333b989d4e44660f8d92ad.zip
kernel_read: redefine offset type
vfs_read() offset is defined as loff_t, but kernel_read() offset is only defined as unsigned long. Redefine kernel_read() offset as loff_t. Cc: stable@kernel.org Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 4a8849e45b2..fb4f3cdda78 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -678,8 +678,8 @@ exit:
}
EXPORT_SYMBOL(open_exec);
-int kernel_read(struct file *file, unsigned long offset,
- char *addr, unsigned long count)
+int kernel_read(struct file *file, loff_t offset,
+ char *addr, unsigned long count)
{
mm_segment_t old_fs;
loff_t pos = offset;