diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2012-12-17 18:59:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:12 -0500 |
commit | 965c8e59cfcf845ecde2265a1d1bfee5f011d302 (patch) | |
tree | 22758a99b4ecb475750966d5202200dc0e89876c /include/linux/fs.h | |
parent | c0f041602c33bae10b8e321c49024490d03ced3d (diff) |
lseek: the "whence" argument is called "whence"
But the kernel decided to call it "origin" instead. Fix most of the
sites.
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 408fb1e77a0a..029552ff774c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2286,9 +2286,9 @@ extern ino_t find_inode_number(struct dentry *, struct qstr *); | |||
2286 | #include <linux/err.h> | 2286 | #include <linux/err.h> |
2287 | 2287 | ||
2288 | /* needed for stackable file system support */ | 2288 | /* needed for stackable file system support */ |
2289 | extern loff_t default_llseek(struct file *file, loff_t offset, int origin); | 2289 | extern loff_t default_llseek(struct file *file, loff_t offset, int whence); |
2290 | 2290 | ||
2291 | extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin); | 2291 | extern loff_t vfs_llseek(struct file *file, loff_t offset, int whence); |
2292 | 2292 | ||
2293 | extern int inode_init_always(struct super_block *, struct inode *); | 2293 | extern int inode_init_always(struct super_block *, struct inode *); |
2294 | extern void inode_init_once(struct inode *); | 2294 | extern void inode_init_once(struct inode *); |
@@ -2396,11 +2396,11 @@ extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, | |||
2396 | 2396 | ||
2397 | extern void | 2397 | extern void |
2398 | file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); | 2398 | file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); |
2399 | extern loff_t noop_llseek(struct file *file, loff_t offset, int origin); | 2399 | extern loff_t noop_llseek(struct file *file, loff_t offset, int whence); |
2400 | extern loff_t no_llseek(struct file *file, loff_t offset, int origin); | 2400 | extern loff_t no_llseek(struct file *file, loff_t offset, int whence); |
2401 | extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin); | 2401 | extern loff_t generic_file_llseek(struct file *file, loff_t offset, int whence); |
2402 | extern loff_t generic_file_llseek_size(struct file *file, loff_t offset, | 2402 | extern loff_t generic_file_llseek_size(struct file *file, loff_t offset, |
2403 | int origin, loff_t maxsize, loff_t eof); | 2403 | int whence, loff_t maxsize, loff_t eof); |
2404 | extern int generic_file_open(struct inode * inode, struct file * filp); | 2404 | extern int generic_file_open(struct inode * inode, struct file * filp); |
2405 | extern int nonseekable_open(struct inode * inode, struct file * filp); | 2405 | extern int nonseekable_open(struct inode * inode, struct file * filp); |
2406 | 2406 | ||