From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIJmG-0004GN-Cw for qemu-devel@nongnu.org; Mon, 02 Feb 2015 11:23:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIJmB-0005nz-OA for qemu-devel@nongnu.org; Mon, 02 Feb 2015 11:23:08 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:9201 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIJmB-0005nB-7R for qemu-devel@nongnu.org; Mon, 02 Feb 2015 11:23:03 -0500 From: "Denis V. Lunev" Date: Mon, 2 Feb 2015 19:23:09 +0300 Message-Id: <1422894190-15477-1-git-send-email-den@openvz.org> In-Reply-To: <1422888514-6495-1-git-send-email-pl@kamp.de> References: <1422888514-6495-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 1/2] glusterfs: fix max_discard List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , Peter Lieven , qemu-devel@nongnu.org qemu_gluster_co_discard calculates size to discard as follows size_t size = nb_sectors * BDRV_SECTOR_SIZE; ret = glfs_discard_async(s->fd, offset, size, &gluster_finish_aiocb, acb); glfs_discard_async is declared as follows: int glfs_discard_async (glfs_fd_t *fd, off_t length, size_t lent, glfs_io_cbk fn, void *data) __THROW This is problematic on i686 as sizeof(size_t) == 4. Set bl_max_discard to INT_MAX >> BDRV_SECTOR_BITS to avoid overflow. Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Peter Lieven --- block/gluster.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/block/gluster.c b/block/gluster.c index 1eb3a8c..ed09691 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -622,6 +622,11 @@ out: return ret; } +static void qemu_gluster_refresh_limits(BlockDriverState *bs, Error **errp) +{ + bs->bl.max_discard = INT_MAX >> BDRV_SECTOR_BITS; +} + #ifdef CONFIG_GLUSTERFS_DISCARD static coroutine_fn int qemu_gluster_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) @@ -735,6 +740,7 @@ static BlockDriver bdrv_gluster = { #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_discard = qemu_gluster_co_discard, #endif + .bdrv_refresh_limits = qemu_gluster_refresh_limits, #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, #endif @@ -762,6 +768,7 @@ static BlockDriver bdrv_gluster_tcp = { #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_discard = qemu_gluster_co_discard, #endif + .bdrv_refresh_limits = qemu_gluster_refresh_limits, #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, #endif @@ -789,6 +796,7 @@ static BlockDriver bdrv_gluster_unix = { #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_discard = qemu_gluster_co_discard, #endif + .bdrv_refresh_limits = qemu_gluster_refresh_limits, #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, #endif @@ -816,6 +824,7 @@ static BlockDriver bdrv_gluster_rdma = { #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_discard = qemu_gluster_co_discard, #endif + .bdrv_refresh_limits = qemu_gluster_refresh_limits, #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, #endif -- 1.9.1