Commit d31d07b9 authored Jul 01, 2019 by Luis Henriques Committed by Ilya Dryomov Jul 08, 2019

ceph: fix end offset in truncate_inode_pages_range call



Commit e450f4d1 ("ceph: pass inclusive lend parameter to
filemap_write_and_wait_range()") fixed the end offset parameter used to
call filemap_write_and_wait_range and invalidate_inode_pages2_range.
Unfortunately it missed truncate_inode_pages_range, introducing a
regression that is easily detected by xfstest generic/130.

The problem is that when doing direct IO it is possible that an extra page
is truncated from the page cache when the end offset is page aligned.
This can cause data loss if that page hasn't been sync'ed to the OSDs.

While there, change code to use PAGE_ALIGN macro instead.

Cc: stable@vger.kernel.org
Fixes: e450f4d1 ("ceph: pass inclusive lend parameter to filemap_write_and_wait_range()")
Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 52dd0f1b

fs/ceph/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1011,7 +1011,7 @@ ceph_direct_read_write(struct kiocb iocb, struct iov_iter iter,
		* may block.
		*/
		truncate_inode_pages_range(inode->i_mapping, pos,
		(pos+len) \| (PAGE_SIZE - 1));
		PAGE_ALIGN(pos + len) - 1);

		req->r_mtime = mtime;
		}

Admin message