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
@@ -1599,19 +1599,19 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
|
||||
return err ? 0 : outarg.block;
|
||||
}
|
||||
|
||||
static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
|
||||
static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence)
|
||||
{
|
||||
loff_t retval;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
|
||||
/* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */
|
||||
if (origin == SEEK_CUR || origin == SEEK_SET)
|
||||
return generic_file_llseek(file, offset, origin);
|
||||
if (whence == SEEK_CUR || whence == SEEK_SET)
|
||||
return generic_file_llseek(file, offset, whence);
|
||||
|
||||
mutex_lock(&inode->i_mutex);
|
||||
retval = fuse_update_attributes(inode, NULL, file, NULL);
|
||||
if (!retval)
|
||||
retval = generic_file_llseek(file, offset, origin);
|
||||
retval = generic_file_llseek(file, offset, whence);
|
||||
mutex_unlock(&inode->i_mutex);
|
||||
|
||||
return retval;
|
||||
|
Reference in New Issue
Block a user