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/ext3 | |
| 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/ext3')
| -rw-r--r-- | fs/ext3/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index c8fff930790d..dd91264ba94f 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c | |||
| @@ -296,17 +296,17 @@ static inline loff_t ext3_get_htree_eof(struct file *filp) | |||
| 296 | * NOTE: offsets obtained *before* ext3_set_inode_flag(dir, EXT3_INODE_INDEX) | 296 | * NOTE: offsets obtained *before* ext3_set_inode_flag(dir, EXT3_INODE_INDEX) |
| 297 | * will be invalid once the directory was converted into a dx directory | 297 | * will be invalid once the directory was converted into a dx directory |
| 298 | */ | 298 | */ |
| 299 | loff_t ext3_dir_llseek(struct file *file, loff_t offset, int origin) | 299 | loff_t ext3_dir_llseek(struct file *file, loff_t offset, int whence) |
| 300 | { | 300 | { |
| 301 | struct inode *inode = file->f_mapping->host; | 301 | struct inode *inode = file->f_mapping->host; |
| 302 | int dx_dir = is_dx_dir(inode); | 302 | int dx_dir = is_dx_dir(inode); |
| 303 | loff_t htree_max = ext3_get_htree_eof(file); | 303 | loff_t htree_max = ext3_get_htree_eof(file); |
| 304 | 304 | ||
| 305 | if (likely(dx_dir)) | 305 | if (likely(dx_dir)) |
| 306 | return generic_file_llseek_size(file, offset, origin, | 306 | return generic_file_llseek_size(file, offset, whence, |
| 307 | htree_max, htree_max); | 307 | htree_max, htree_max); |
| 308 | else | 308 | else |
| 309 | return generic_file_llseek(file, offset, origin); | 309 | return generic_file_llseek(file, offset, whence); |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | /* | 312 | /* |
