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/ext4/dir.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/ext4/dir.c')
-rw-r--r-- | fs/ext4/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index b8d877f6c1fa..80a28b297279 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c | |||
@@ -333,17 +333,17 @@ static inline loff_t ext4_get_htree_eof(struct file *filp) | |||
333 | * | 333 | * |
334 | * For non-htree, ext4_llseek already chooses the proper max offset. | 334 | * For non-htree, ext4_llseek already chooses the proper max offset. |
335 | */ | 335 | */ |
336 | loff_t ext4_dir_llseek(struct file *file, loff_t offset, int origin) | 336 | loff_t ext4_dir_llseek(struct file *file, loff_t offset, int whence) |
337 | { | 337 | { |
338 | struct inode *inode = file->f_mapping->host; | 338 | struct inode *inode = file->f_mapping->host; |
339 | int dx_dir = is_dx_dir(inode); | 339 | int dx_dir = is_dx_dir(inode); |
340 | loff_t htree_max = ext4_get_htree_eof(file); | 340 | loff_t htree_max = ext4_get_htree_eof(file); |
341 | 341 | ||
342 | if (likely(dx_dir)) | 342 | if (likely(dx_dir)) |
343 | return generic_file_llseek_size(file, offset, origin, | 343 | return generic_file_llseek_size(file, offset, whence, |
344 | htree_max, htree_max); | 344 | htree_max, htree_max); |
345 | else | 345 | else |
346 | return ext4_llseek(file, offset, origin); | 346 | return ext4_llseek(file, offset, whence); |
347 | } | 347 | } |
348 | 348 | ||
349 | /* | 349 | /* |