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/block_dev.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/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index ab3a456f6650..172f8491a2bd 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -321,7 +321,7 @@ static int blkdev_write_end(struct file *file, struct address_space *mapping, | |||
321 | * for a block special file file->f_path.dentry->d_inode->i_size is zero | 321 | * for a block special file file->f_path.dentry->d_inode->i_size is zero |
322 | * so we compute the size by hand (just as in block_read/write above) | 322 | * so we compute the size by hand (just as in block_read/write above) |
323 | */ | 323 | */ |
324 | static loff_t block_llseek(struct file *file, loff_t offset, int origin) | 324 | static loff_t block_llseek(struct file *file, loff_t offset, int whence) |
325 | { | 325 | { |
326 | struct inode *bd_inode = file->f_mapping->host; | 326 | struct inode *bd_inode = file->f_mapping->host; |
327 | loff_t size; | 327 | loff_t size; |
@@ -331,7 +331,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin) | |||
331 | size = i_size_read(bd_inode); | 331 | size = i_size_read(bd_inode); |
332 | 332 | ||
333 | retval = -EINVAL; | 333 | retval = -EINVAL; |
334 | switch (origin) { | 334 | switch (whence) { |
335 | case SEEK_END: | 335 | case SEEK_END: |
336 | offset += size; | 336 | offset += size; |
337 | break; | 337 | break; |