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

Commit 93ab28b2 authored by Ernesto A. Fernández's avatar Ernesto A. Fernández Committed by Greg Kroah-Hartman
Browse files

direct-io: allow direct writes to empty inodes 



[ Upstream commit 8b9433eb4de3c26a9226c981c283f9f4896ae030 ]

On a DIO_SKIP_HOLES filesystem, the ->get_block() method is currently
not allowed to create blocks for an empty inode.  This confusion comes
from trying to bit shift a negative number, so check the size of the
inode first.

The problem is most visible for hfsplus, because the fallback to
buffered I/O doesn't happen and the write fails with EIO.  This is in
part the fault of the module, because it gives a wrong return value on
->get_block(); that will be fixed in a separate patch.

Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarErnesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2b7d22eb

fs/direct-io.c

+3 −2
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ static int get_more_blocks(struct dio *dio, struct dio_submit *sdio, 
	unsigned long fs_count;	/* Number of filesystem-sized blocks */

	int create;

	unsigned int i_blkbits = sdio->blkbits + sdio->blkfactor;

	loff_t i_size;



	/*

	 * If there was a memory error and we've overwritten all the
@@ -645,8 +646,8 @@ static int get_more_blocks(struct dio *dio, struct dio_submit *sdio, 
		 */

		create = dio->op == REQ_OP_WRITE;

		if (dio->flags & DIO_SKIP_HOLES) {

			if (fs_startblk <= ((i_size_read(dio->inode) - 1) >>

							i_blkbits))

			i_size = i_size_read(dio->inode);

			if (i_size && fs_startblk <= (i_size - 1) >> i_blkbits)

				create = 0;

		}