Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 955818cd authored by Phil Turnbull's avatar Phil Turnbull Committed by Ilya Dryomov
Browse files

ceph: Correctly return NXIO errors from ceph_llseek 



ceph_llseek does not correctly return NXIO errors because the 'out' path
always returns 'offset'.

Fixes: 06222e49 ("fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek")
Signed-off-by: default avatarPhil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent 6b1a9a6c

fs/ceph/file.c

+5 −7
Original line number Diff line number Diff line
@@ -1499,17 +1499,15 @@ 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);

	switch (whence) {
@@ -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(