diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:12:40 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-26 23:12:40 -0400 |
| commit | f480fe3916de2e2cbb6e384cb685f0f1d8272188 (patch) | |
| tree | 141c60a2a263f1c01907e692d4aef1e6b699d8c7 /include/linux/fs.h | |
| parent | 4f0dbc2781b9dc457159b676289f874ab2dc3560 (diff) | |
| parent | f415c413f458837bd0c27086b79aca889f9435e4 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'include/linux/fs.h')
| -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 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, | |||
| 2123 | int open_flag, int mode, int acc_mode); | 2123 | int open_flag, int mode, int acc_mode); |
| 2124 | extern int may_open(struct path *, int, int); | 2124 | extern int may_open(struct path *, int, int); |
| 2125 | 2125 | ||
| 2126 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); | 2126 | extern int kernel_read(struct file *, loff_t, char *, unsigned long); |
| 2127 | extern struct file * open_exec(const char *); | 2127 | extern struct file * open_exec(const char *); |
| 2128 | 2128 | ||
| 2129 | /* fs/dcache.c -- generic fs support functions */ | 2129 | /* fs/dcache.c -- generic fs support functions */ |