diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-08-21 14:32:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-08 20:33:22 -0700 |
| commit | c80dd82ff1f0a39fb8153f0c6719cfca8e4493a0 (patch) | |
| tree | 70dbf8ae3db1b27af31ccb2e3980454553553527 | |
| parent | 392647fca76640773e16a701c94faa94423f57bf (diff) | |
kernel_read: redefine offset type
commit 6777d773a463ac045d333b989d4e44660f8d92ad upstream.
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.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 895823d0149d..42414e5a1a1d 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -677,8 +677,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 3b534e527e09..3b3f7713fe2e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2121,7 +2121,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 */ |