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 | |
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')
-rw-r--r-- | include/linux/fs.h | 12 | ||||
-rw-r--r-- | include/linux/ftrace.h | 4 | ||||
-rw-r--r-- | include/linux/syscalls.h | 4 |
3 files changed, 10 insertions, 10 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 | ||
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index a52f2f4fe030..92691d85c320 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
@@ -394,7 +394,7 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, | |||
394 | size_t cnt, loff_t *ppos); | 394 | size_t cnt, loff_t *ppos); |
395 | ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, | 395 | ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, |
396 | size_t cnt, loff_t *ppos); | 396 | size_t cnt, loff_t *ppos); |
397 | loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin); | 397 | loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence); |
398 | int ftrace_regex_release(struct inode *inode, struct file *file); | 398 | int ftrace_regex_release(struct inode *inode, struct file *file); |
399 | 399 | ||
400 | void __init | 400 | void __init |
@@ -559,7 +559,7 @@ static inline ssize_t ftrace_filter_write(struct file *file, const char __user * | |||
559 | size_t cnt, loff_t *ppos) { return -ENODEV; } | 559 | size_t cnt, loff_t *ppos) { return -ENODEV; } |
560 | static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, | 560 | static inline ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, |
561 | size_t cnt, loff_t *ppos) { return -ENODEV; } | 561 | size_t cnt, loff_t *ppos) { return -ENODEV; } |
562 | static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int origin) | 562 | static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence) |
563 | { | 563 | { |
564 | return -ENODEV; | 564 | return -ENODEV; |
565 | } | 565 | } |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 91835e7f364d..36c3b07c5119 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -560,10 +560,10 @@ asmlinkage long sys_utime(char __user *filename, | |||
560 | asmlinkage long sys_utimes(char __user *filename, | 560 | asmlinkage long sys_utimes(char __user *filename, |
561 | struct timeval __user *utimes); | 561 | struct timeval __user *utimes); |
562 | asmlinkage long sys_lseek(unsigned int fd, off_t offset, | 562 | asmlinkage long sys_lseek(unsigned int fd, off_t offset, |
563 | unsigned int origin); | 563 | unsigned int whence); |
564 | asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, | 564 | asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, |
565 | unsigned long offset_low, loff_t __user *result, | 565 | unsigned long offset_low, loff_t __user *result, |
566 | unsigned int origin); | 566 | unsigned int whence); |
567 | asmlinkage long sys_read(unsigned int fd, char __user *buf, size_t count); | 567 | asmlinkage long sys_read(unsigned int fd, char __user *buf, size_t count); |
568 | asmlinkage long sys_readahead(int fd, loff_t offset, size_t count); | 568 | asmlinkage long sys_readahead(int fd, loff_t offset, size_t count); |
569 | asmlinkage long sys_readv(unsigned long fd, | 569 | asmlinkage long sys_readv(unsigned long fd, |