From nobody Sun Apr 28 14:49:51 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=1564446560; cv=none; d=zoho.com; s=zohoarc; b=BEY3CWHRctj4fhCT9UGVfZZWr0u5ejPT9zg3QHvah2ociG+sLuOCjnOqimi2QswgSEnmDh6Cl3ojOcREWV3MrAyzvxuN+8YScO0Wlw/LPF1kE7hFQSibgOIPGRcCx+M1KRh5Y8yML+mSfNOsHXpS64H6A+5pJLbaGC++NxUIDJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564446560; 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=vjFXaF9VkC1UQphv21MhcFQtKh8F4gjaAWW9vPE2KXk=; b=QVzlcC8qE/rV1V5wUwsTEtLZFr81f4K+1m7WJAJ2F8fDkGbk061zSUJMp1s5NVZ7eqUZUqBgQXP4C9LpvRIJIR9n6stcydEDGCWeL0Dwcw5pAW70AZYRPtIJX2E07WULLoaPMCpPU0mtKlY96YU1ZmA0zCw9Y1rd++LE8zsXE/k= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564446560293988.1716582351869; Mon, 29 Jul 2019 17:29:20 -0700 (PDT) Received: from localhost ([::1]:57170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsG0t-0006G5-S6 for importer@patchew.org; Mon, 29 Jul 2019 20:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58013) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsFzo-0005mZ-Hp for qemu-devel@nongnu.org; Mon, 29 Jul 2019 20:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsFzn-0002Rb-Gc for qemu-devel@nongnu.org; Mon, 29 Jul 2019 20:28:04 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2245 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsFzm-0002Nu-El for qemu-devel@nongnu.org; Mon, 29 Jul 2019 20:28:03 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 99CC23CCB98E78BC1612; Tue, 30 Jul 2019 08:27:57 +0800 (CST) Received: from [10.177.253.249] (10.177.253.249) by smtp.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.439.0; Tue, 30 Jul 2019 08:27:50 +0800 To: , From: piaojun Message-ID: <5D3F8F04.3030404@huawei.com> Date: Tue, 30 Jul 2019 08:27:48 +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.191 Subject: [Qemu-devel] [PATCH] 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: piaojun@huawei.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. Signed-off-by: Jun Piao --- contrib/virtiofsd/passthrough_ll.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthr= ough_ll.c index 9ae1381..757785b 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -1619,7 +1619,11 @@ static void lo_getlk(fuse_req_t req, fuse_ino_t ino, return; } +#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; pthread_mutex_unlock(&inode->plock_mutex); @@ -1668,7 +1672,12 @@ 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_GETLK ret =3D fcntl(plock->fd, F_OFD_SETLK, lock); +#else + ret =3D fcntl(plock->fd, F_SETLK, lock); +#endif if (ret =3D=3D -1) { saverr =3D errno; } --=20