diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-08-21 14:32:48 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-24 14:58:23 +1000 |
| commit | 6777d773a463ac045d333b989d4e44660f8d92ad (patch) | |
| tree | 17291984d71515cec0a1970ecce3d631ed2f7981 | |
| parent | 3edf2fb9d80a46d6c32ba12547a42419845b4b76 (diff) | |
| download | blackbird-op-linux-6777d773a463ac045d333b989d4e44660f8d92ad.tar.gz blackbird-op-linux-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>
| -rw-r--r-- | fs/exec.c | 4 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c index 4a8849e45b21..fb4f3cdda78c 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; diff --git a/include/linux/fs.h b/include/linux/fs.h index 67888a9e0655..73e9b643e455 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2123,7 +2123,7 @@ extern struct file *do_filp_open(int dfd, const char *pathname, int open_flag, int mode, int acc_mode); extern int may_open(struct path *, int, int); -extern int kernel_read(struct file *, unsigned long, char *, unsigned long); +extern int kernel_read(struct file *, loff_t, char *, unsigned long); extern struct file * open_exec(const char *); /* fs/dcache.c -- generic fs support functions */ |
