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>
This commit is contained in:

committed by
Linus Torvalds

parent
c0f041602c
commit
965c8e59cf
@@ -296,17 +296,17 @@ static inline loff_t ext3_get_htree_eof(struct file *filp)
|
||||
* NOTE: offsets obtained *before* ext3_set_inode_flag(dir, EXT3_INODE_INDEX)
|
||||
* will be invalid once the directory was converted into a dx directory
|
||||
*/
|
||||
loff_t ext3_dir_llseek(struct file *file, loff_t offset, int origin)
|
||||
loff_t ext3_dir_llseek(struct file *file, loff_t offset, int whence)
|
||||
{
|
||||
struct inode *inode = file->f_mapping->host;
|
||||
int dx_dir = is_dx_dir(inode);
|
||||
loff_t htree_max = ext3_get_htree_eof(file);
|
||||
|
||||
if (likely(dx_dir))
|
||||
return generic_file_llseek_size(file, offset, origin,
|
||||
return generic_file_llseek_size(file, offset, whence,
|
||||
htree_max, htree_max);
|
||||
else
|
||||
return generic_file_llseek(file, offset, origin);
|
||||
return generic_file_llseek(file, offset, whence);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user