|
@@ -1499,16 +1499,14 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
|
|
|
{
|
|
|
struct inode *inode = file->f_mapping->host;
|
|
|
loff_t i_size;
|
|
|
- int ret;
|
|
|
+ loff_t ret;
|
|
|
|
|
|
inode_lock(inode);
|
|
|
|
|
|
if (whence == SEEK_END || whence == SEEK_DATA || whence == SEEK_HOLE) {
|
|
|
ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE, false);
|
|
|
- if (ret < 0) {
|
|
|
- offset = ret;
|
|
|
+ if (ret < 0)
|
|
|
goto out;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
i_size = i_size_read(inode);
|
|
@@ -1524,7 +1522,7 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
|
|
|
* write() or lseek() might have altered it
|
|
|
*/
|
|
|
if (offset == 0) {
|
|
|
- offset = file->f_pos;
|
|
|
+ ret = file->f_pos;
|
|
|
goto out;
|
|
|
}
|
|
|
offset += file->f_pos;
|
|
@@ -1544,11 +1542,11 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
|
|
|
+ ret = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
|
|
|
|
|
|
out:
|
|
|
inode_unlock(inode);
|
|
|
- return offset;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static inline void ceph_zero_partial_page(
|