From nobody Mon May 6 22:22:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1564735158; cv=none; d=zoho.com; s=zohoarc; b=fn/dThivTHwyIaTycY5Cu7QgyNB84DsVUa77wkp3CAnxWGkwdAgkHh4njikHTlG+cjU7adwc2dKtXrVXl72KHKgRI3brlx/fXatSqOAHOABRHxNzV1DdLPBfu4GZrTexLgUhwJifDzNNPjnH1WHT6SDlSqOEUvS88X/4FZxfHeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564735158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=OqncxqIaYPfZWUsWolLMz7GQF/ZZ4z1NR+gYSjVnK8U=; b=KE17kZZgMkBJAC18RamIW8B0ht4/pRl3LSkn7z0Au+9kCcCzCceKjSd00P4T7A0N98R32LCOKHPvHzpNCrsc7BSZ+oXGbOtC8oDs9Fi39o7ZLACk6H9AyWzMRKAJ8ONLbqdVVEBu42XAM4d1yb1xj83BTG76S0xc8544Mc46JME= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564735158431373.71294486647867; Fri, 2 Aug 2019 01:39:18 -0700 (PDT) Received: from localhost ([::1]:60982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htT5p-00013Q-E7 for importer@patchew.org; Fri, 02 Aug 2019 04:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43900) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htT5I-0000dY-Lw for qemu-devel@nongnu.org; Fri, 02 Aug 2019 04:38:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htT5H-00081P-OY for qemu-devel@nongnu.org; Fri, 02 Aug 2019 04:38:44 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:50528 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1htT5H-0007zU-EI for qemu-devel@nongnu.org; Fri, 02 Aug 2019 04:38:43 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 9E9AA1BC24276AE9E52F; Fri, 2 Aug 2019 16:38:37 +0800 (CST) Received: from [10.177.253.249] (10.177.253.249) by smtp.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Fri, 2 Aug 2019 16:38:33 +0800 To: , From: piaojun Message-ID: <5D43F688.8000607@huawei.com> Date: Fri, 2 Aug 2019 16:38:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.177.253.249] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.35 Subject: [Qemu-devel] [PATCH v2] virtiofsd: fix compile error if 'F_OFD_GETLK' not defined X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Use F_GETLK for fcntl when F_OFD_GETLK not defined, such as kernel 3.10. Signed-off-by: Jun Piao --- v2: - Use F_OFD_SETLK to replace F_OFD_GETLK in #ifdef. --- contrib/virtiofsd/passthrough_ll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthr= ough_ll.c index a81c01d..c69f2f3 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -1780,7 +1780,11 @@ static void lo_getlk(fuse_req_t req, fuse_ino_t ino, goto out; } +#ifdef F_OFD_GETLK ret =3D fcntl(plock->fd, F_OFD_GETLK, lock); +#else + ret =3D fcntl(plock->fd, F_GETLK, lock); +#endif if (ret =3D=3D -1) saverr =3D errno; @@ -1831,7 +1835,11 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, /* TODO: Is it alright to modify flock? */ lock->l_pid =3D 0; +#ifdef F_OFD_SETLK ret =3D fcntl(plock->fd, F_OFD_SETLK, lock); +#else + ret =3D fcntl(plock->fd, F_GETLK, lock); +#endif if (ret =3D=3D -1) { saverr =3D errno; } --=20