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/ubifs | |
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/ubifs')
-rw-r--r-- | fs/ubifs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index e271fba1651b..8a574776a493 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -453,11 +453,11 @@ out: | |||
453 | } | 453 | } |
454 | 454 | ||
455 | /* If a directory is seeked, we have to free saved readdir() state */ | 455 | /* If a directory is seeked, we have to free saved readdir() state */ |
456 | static loff_t ubifs_dir_llseek(struct file *file, loff_t offset, int origin) | 456 | static loff_t ubifs_dir_llseek(struct file *file, loff_t offset, int whence) |
457 | { | 457 | { |
458 | kfree(file->private_data); | 458 | kfree(file->private_data); |
459 | file->private_data = NULL; | 459 | file->private_data = NULL; |
460 | return generic_file_llseek(file, offset, origin); | 460 | return generic_file_llseek(file, offset, whence); |
461 | } | 461 | } |
462 | 462 | ||
463 | /* Free saved readdir() state when the directory is closed */ | 463 | /* Free saved readdir() state when the directory is closed */ |