diff options
| author | Phil Turnbull <phil.turnbull@oracle.com> | 2016-07-21 13:43:09 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-07-28 03:00:45 +0200 |
| commit | 955818cd5b6c4b58ea574ace4573e7afa4c19c1e (patch) | |
| tree | fc5b53a6a53a92ddaf70a4d1882c706481d5a0bd /fs/ceph | |
| parent | 6b1a9a6c54122dade800fd61e90d441e58de19eb (diff) | |
| download | op-kernel-dev-955818cd5b6c4b58ea574ace4573e7afa4c19c1e.zip op-kernel-dev-955818cd5b6c4b58ea574ace4573e7afa4c19c1e.tar.gz | |
ceph: Correctly return NXIO errors from ceph_llseek
ceph_llseek does not correctly return NXIO errors because the 'out' path
always returns 'offset'.
Fixes: 06222e491e66 ("fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek")
Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/file.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 7f2ef26..0f5375d 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -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( |
