From nobody Sat Apr 27 05:36:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523531871855166.04552034036135; Thu, 12 Apr 2018 04:17:51 -0700 (PDT) Received: from localhost ([::1]:58936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6aEh-0002q0-1w for importer@patchew.org; Thu, 12 Apr 2018 07:17:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6aDK-0002I0-8a for qemu-devel@nongnu.org; Thu, 12 Apr 2018 07:16:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6aDG-0002Ov-8b for qemu-devel@nongnu.org; Thu, 12 Apr 2018 07:16:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41758 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f6aDG-0002Me-51 for qemu-devel@nongnu.org; Thu, 12 Apr 2018 07:16:22 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44F3581A88A3 for ; Thu, 12 Apr 2018 11:16:21 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A81C215CDC6; Thu, 12 Apr 2018 11:16:18 +0000 (UTC) From: Prasanna Kumar Kalever To: qemu-devel@nongnu.org Date: Thu, 12 Apr 2018 16:46:14 +0530 Message-Id: <20180412111614.9724-1-prasanna.kalever@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 12 Apr 2018 11:16:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 12 Apr 2018 11:16:21 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'prasanna.kalever@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] block/gluster: defend on legacy ftruncate api use X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasanna Kumar Kalever , ndevos@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Prasanna Kumar Kalever Reviewed-by: Niels de Vos --- block/gluster.c | 15 +++++++++++++-- configure | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 4adc1a875b..2474580ad6 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -996,6 +996,7 @@ static int qemu_gluster_do_truncate(struct glfs_fd *fd,= int64_t offset, PreallocMode prealloc, Error **errp) { int64_t current_length; + int ret; =20 current_length =3D glfs_lseek(fd, 0, SEEK_END); if (current_length < 0) { @@ -1023,7 +1024,12 @@ static int qemu_gluster_do_truncate(struct glfs_fd *= fd, int64_t offset, #endif /* CONFIG_GLUSTERFS_FALLOCATE */ #ifdef CONFIG_GLUSTERFS_ZEROFILL case PREALLOC_MODE_FULL: - if (glfs_ftruncate(fd, offset)) { +#ifdef CONFIG_GLUSTERFS_LEGACY_FTRUNCATE + ret =3D glfs_ftruncate(fd, offset); +#else + ret =3D glfs_ftruncate(fd, offset, NULL, NULL); +#endif + if (ret) { error_setg_errno(errp, errno, "Could not resize file"); return -errno; } @@ -1034,7 +1040,12 @@ static int qemu_gluster_do_truncate(struct glfs_fd *= fd, int64_t offset, break; #endif /* CONFIG_GLUSTERFS_ZEROFILL */ case PREALLOC_MODE_OFF: - if (glfs_ftruncate(fd, offset)) { +#ifdef CONFIG_GLUSTERFS_LEGACY_FTRUNCATE + ret =3D glfs_ftruncate(fd, offset); +#else + ret =3D glfs_ftruncate(fd, offset, NULL, NULL); +#endif + if (ret) { error_setg_errno(errp, errno, "Could not resize file"); return -errno; } diff --git a/configure b/configure index 0a19b033bc..69827b0098 100755 --- a/configure +++ b/configure @@ -429,6 +429,7 @@ glusterfs_xlator_opt=3D"no" glusterfs_discard=3D"no" glusterfs_fallocate=3D"no" glusterfs_zerofill=3D"no" +glusterfs_legacy_ftruncate=3D"no" gtk=3D"" gtkabi=3D"" gtk_gl=3D"no" @@ -3856,6 +3857,9 @@ if test "$glusterfs" !=3D "no" ; then glusterfs_fallocate=3D"yes" glusterfs_zerofill=3D"yes" fi + if ! $pkg_config --atleast-version=3D7.4 glusterfs-api; then + glusterfs_legacy_ftruncate=3D"yes" + fi else if test "$glusterfs" =3D "yes" ; then feature_not_found "GlusterFS backend support" \ @@ -6502,6 +6506,10 @@ if test "$glusterfs_zerofill" =3D "yes" ; then echo "CONFIG_GLUSTERFS_ZEROFILL=3Dy" >> $config_host_mak fi =20 +if test "$glusterfs_legacy_ftruncate" =3D "yes" ; then + echo "CONFIG_GLUSTERFS_LEGACY_FTRUNCATE=3Dy" >> $config_host_mak +fi + if test "$libssh2" =3D "yes" ; then echo "CONFIG_LIBSSH2=3Dm" >> $config_host_mak echo "LIBSSH2_CFLAGS=3D$libssh2_cflags" >> $config_host_mak --=20 2.14.3