From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <io-uring-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by smtp.lore.kernel.org (Postfix) with ESMTP id 54E86C433EF
for <io-uring@archiver.kernel.org>; Wed, 1 Jun 2022 21:08:16 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231277AbiFAVIM (ORCPT <rfc822;io-uring@archiver.kernel.org>);
Wed, 1 Jun 2022 17:08:12 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49548 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231267AbiFAVIM (ORCPT
<rfc822;io-uring@vger.kernel.org>); Wed, 1 Jun 2022 17:08:12 -0400
Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54C514D603
for <io-uring@vger.kernel.org>; Wed, 1 Jun 2022 14:08:11 -0700 (PDT)
Received: from pps.filterd (m0089730.ppops.net [127.0.0.1])
by m0089730.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 251IbLN8020383
for <io-uring@vger.kernel.org>; Wed, 1 Jun 2022 14:08:10 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject
: date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=facebook;
bh=UYSVIRU3OqHDXp36Z+9UaO8Gk0kt2REYQWE1ANvgX7U=;
b=keoA+bCwpvGGQ1fvUj6GcBQX1BHxuhWSDiLo4Tmnx/ljZ8LiieXiVZqgCD2ps9ArT8EY
gcqVboNEm4BG1v0IQ6EAs7E8Sr9FPdRDNdPfe5JNLIgMyNSaBfqXZSYN5vuEX4CsDV6s
GgNCOmmUeyLvyfJpuPwMC/i53PfXILMmum0=
Received: from mail.thefacebook.com ([163.114.132.120])
by m0089730.ppops.net (PPS) with ESMTPS id 3ge5atvexa-4
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT)
for <io-uring@vger.kernel.org>; Wed, 01 Jun 2022 14:08:10 -0700
Received: from twshared19572.14.frc2.facebook.com (2620:10d:c085:108::8) by
mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2375.28; Wed, 1 Jun 2022 14:08:07 -0700
Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415)
id 167ACFEB23B1; Wed, 1 Jun 2022 14:01:43 -0700 (PDT)
From: Stefan Roesch <shr@fb.com>
To: <io-uring@vger.kernel.org>, <kernel-team@fb.com>,
<linux-mm@kvack.org>, <linux-xfs@vger.kernel.org>,
<linux-fsdevel@vger.kernel.org>
CC: <shr@fb.com>, <david@fromorbit.com>, <jack@suse.cz>,
<hch@infradead.org>, <axboe@kernel.dk>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v7 14/15] xfs: Specify lockmode when calling xfs_ilock_for_iomap()
Date: Wed, 1 Jun 2022 14:01:40 -0700
Message-ID: <20220601210141.3773402-15-shr@fb.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220601210141.3773402-1-shr@fb.com>
References: <20220601210141.3773402-1-shr@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-FB-Internal: Safe
Content-Type: text/plain
X-Proofpoint-GUID: w1CMOflI-6X2QBXlEz_897CHnb7YdlZb
X-Proofpoint-ORIG-GUID: w1CMOflI-6X2QBXlEz_897CHnb7YdlZb
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514
definitions=2022-06-01_08,2022-06-01_01,2022-02-23_01
Precedence: bulk
List-ID: <io-uring.vger.kernel.org>
X-Mailing-List: io-uring@vger.kernel.org
This patch changes the helper function xfs_ilock_for_iomap such that the
lock mode must be passed in.
Signed-off-by: Stefan Roesch <shr@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_iomap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 5a393259a3a3..bcf7c3694290 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -664,7 +664,7 @@ xfs_ilock_for_iomap(
unsigned flags,
unsigned *lockmode)
{
- unsigned mode =3D XFS_ILOCK_SHARED;
+ unsigned int mode =3D *lockmode;
bool is_write =3D flags & (IOMAP_WRITE | IOMAP_ZERO);
=20
/*
@@ -742,7 +742,7 @@ xfs_direct_write_iomap_begin(
int nimaps =3D 1, error =3D 0;
bool shared =3D false;
u16 iomap_flags =3D 0;
- unsigned lockmode;
+ unsigned int lockmode =3D XFS_ILOCK_SHARED;
=20
ASSERT(flags & (IOMAP_WRITE | IOMAP_ZERO));
=20
@@ -1172,7 +1172,7 @@ xfs_read_iomap_begin(
xfs_fileoff_t end_fsb =3D xfs_iomap_end_fsb(mp, offset, length);
int nimaps =3D 1, error =3D 0;
bool shared =3D false;
- unsigned lockmode;
+ unsigned int lockmode =3D XFS_ILOCK_SHARED;
=20
ASSERT(!(flags & (IOMAP_WRITE | IOMAP_ZERO)));
=20
--=20
2.30.2