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 /fs/ocfs2/file.c | |
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 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index dda089804942..fe492e1a3cfc 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2637,14 +2637,14 @@ bail: | |||
2637 | } | 2637 | } |
2638 | 2638 | ||
2639 | /* Refer generic_file_llseek_unlocked() */ | 2639 | /* Refer generic_file_llseek_unlocked() */ |
2640 | static loff_t ocfs2_file_llseek(struct file *file, loff_t offset, int origin) | 2640 | static loff_t ocfs2_file_llseek(struct file *file, loff_t offset, int whence) |
2641 | { | 2641 | { |
2642 | struct inode *inode = file->f_mapping->host; | 2642 | struct inode *inode = file->f_mapping->host; |
2643 | int ret = 0; | 2643 | int ret = 0; |
2644 | 2644 | ||
2645 | mutex_lock(&inode->i_mutex); | 2645 | mutex_lock(&inode->i_mutex); |
2646 | 2646 | ||
2647 | switch (origin) { | 2647 | switch (whence) { |
2648 | case SEEK_SET: | 2648 | case SEEK_SET: |
2649 | break; | 2649 | break; |
2650 | case SEEK_END: | 2650 | case SEEK_END: |
@@ -2659,7 +2659,7 @@ static loff_t ocfs2_file_llseek(struct file *file, loff_t offset, int origin) | |||
2659 | break; | 2659 | break; |
2660 | case SEEK_DATA: | 2660 | case SEEK_DATA: |
2661 | case SEEK_HOLE: | 2661 | case SEEK_HOLE: |
2662 | ret = ocfs2_seek_data_hole_offset(file, &offset, origin); | 2662 | ret = ocfs2_seek_data_hole_offset(file, &offset, whence); |
2663 | if (ret) | 2663 | if (ret) |
2664 | goto out; | 2664 | goto out; |
2665 | break; | 2665 | break; |