diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 12:24:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 12:24:01 -0700 |
| commit | ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a (patch) | |
| tree | f06e627594a79086905f798ea0779774beae38ae /include | |
| parent | 637952ca689013339b977558061fa4ca8e07e1c1 (diff) | |
| parent | 16bfa38b1936212428cb38fbfbbb8f6c62b8d81f (diff) | |
| download | op-kernel-dev-ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a.zip op-kernel-dev-ce0cfd4ca817dbfd5f8267e7a6a235ed2041bf4a.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
ima: hashing large files bug fix
kernel_read: redefine offset type
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 67888a9..73e9b64 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 */ |
