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

Commit 6a82c47a authored by Sage Weil's avatar Sage Weil
Browse files

ceph: fix SEEK_CUR, SEEK_SET regression 



Commit 06222e49 got the if wrong so that
it always evaluates as true.  This is semantically harmless, but makes
SEEK_CUR and SEEK_SET needlessly query the server.

Rewrite the if to explicitly enumerate the cases we DO need a valid i_size
to make this code less fragile.

Reported-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent f1932fc1

fs/ceph/file.c

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,8 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int origin) 


	mutex_lock(&inode->i_mutex);

	__ceph_do_pending_vmtruncate(inode);

	if (origin != SEEK_CUR || origin != SEEK_SET) {



	if (origin == SEEK_END || origin == SEEK_DATA || origin == SEEK_HOLE) {

		ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE);

		if (ret < 0) {

			offset = ret;