lseek_execute() doesn't need an inode passed to it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
5d48f3a2de
commit
2142914e3e
|
@ -41,8 +41,7 @@ static inline int unsigned_offsets(struct file *file)
|
||||||
return file->f_mode & FMODE_UNSIGNED_OFFSET;
|
return file->f_mode & FMODE_UNSIGNED_OFFSET;
|
||||||
}
|
}
|
||||||
|
|
||||||
static loff_t lseek_execute(struct file *file, struct inode *inode,
|
static loff_t lseek_execute(struct file *file, loff_t offset, loff_t maxsize)
|
||||||
loff_t offset, loff_t maxsize)
|
|
||||||
{
|
{
|
||||||
if (offset < 0 && !unsigned_offsets(file))
|
if (offset < 0 && !unsigned_offsets(file))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -76,8 +75,6 @@ loff_t
|
||||||
generic_file_llseek_size(struct file *file, loff_t offset, int whence,
|
generic_file_llseek_size(struct file *file, loff_t offset, int whence,
|
||||||
loff_t maxsize, loff_t eof)
|
loff_t maxsize, loff_t eof)
|
||||||
{
|
{
|
||||||
struct inode *inode = file->f_mapping->host;
|
|
||||||
|
|
||||||
switch (whence) {
|
switch (whence) {
|
||||||
case SEEK_END:
|
case SEEK_END:
|
||||||
offset += eof;
|
offset += eof;
|
||||||
|
@ -97,8 +94,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,
|
||||||
* like SEEK_SET.
|
* like SEEK_SET.
|
||||||
*/
|
*/
|
||||||
spin_lock(&file->f_lock);
|
spin_lock(&file->f_lock);
|
||||||
offset = lseek_execute(file, inode, file->f_pos + offset,
|
offset = lseek_execute(file, file->f_pos + offset, maxsize);
|
||||||
maxsize);
|
|
||||||
spin_unlock(&file->f_lock);
|
spin_unlock(&file->f_lock);
|
||||||
return offset;
|
return offset;
|
||||||
case SEEK_DATA:
|
case SEEK_DATA:
|
||||||
|
@ -120,7 +116,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return lseek_execute(file, inode, offset, maxsize);
|
return lseek_execute(file, offset, maxsize);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(generic_file_llseek_size);
|
EXPORT_SYMBOL(generic_file_llseek_size);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue