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/fuse | |
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/fuse')
-rw-r--r-- | fs/fuse/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 78d2837bc940..e21d4d8f87e3 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1599,19 +1599,19 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) | |||
1599 | return err ? 0 : outarg.block; | 1599 | return err ? 0 : outarg.block; |
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin) | 1602 | static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence) |
1603 | { | 1603 | { |
1604 | loff_t retval; | 1604 | loff_t retval; |
1605 | struct inode *inode = file->f_path.dentry->d_inode; | 1605 | struct inode *inode = file->f_path.dentry->d_inode; |
1606 | 1606 | ||
1607 | /* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */ | 1607 | /* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */ |
1608 | if (origin == SEEK_CUR || origin == SEEK_SET) | 1608 | if (whence == SEEK_CUR || whence == SEEK_SET) |
1609 | return generic_file_llseek(file, offset, origin); | 1609 | return generic_file_llseek(file, offset, whence); |
1610 | 1610 | ||
1611 | mutex_lock(&inode->i_mutex); | 1611 | mutex_lock(&inode->i_mutex); |
1612 | retval = fuse_update_attributes(inode, NULL, file, NULL); | 1612 | retval = fuse_update_attributes(inode, NULL, file, NULL); |
1613 | if (!retval) | 1613 | if (!retval) |
1614 | retval = generic_file_llseek(file, offset, origin); | 1614 | retval = generic_file_llseek(file, offset, whence); |
1615 | mutex_unlock(&inode->i_mutex); | 1615 | mutex_unlock(&inode->i_mutex); |
1616 | 1616 | ||
1617 | return retval; | 1617 | return retval; |