From patchwork Mon Dec 2 11:19:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13890293 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A926209660; Mon, 2 Dec 2024 11:20:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138452; cv=fail; b=uuyqNTNhNaZT9p/1IKREOupsARVkq9Sh87Np1WBR24sLzpwbAwZWKwu3h/JPR5NqFtZjSwlW4MQMojpCjt9L9BgISFB7y189WpFUcZImbs2mAOvPtV45W/wPb8hx6AFQegvWjGiNOfUh4heMCmkgxzf91/1Qmlt+xH5QxVt0gn0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138452; c=relaxed/simple; bh=zNMkj1XPmtZ4zyH2oFNePG7SunD6afVFQITbqbUh7Fo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=q1ouKYc3qeSsJCSPa1/mGXRtqM3WbRWRzIHUIooUjFUkq1xUZMHcr2mFqH4YGp9fvzTFyTeupYecKu1r+NggMGYMvMlDDrNbaphIPaziQ35zsdz9GHFARHb+KUWjypE8nrs2a8tM00CtuTDzFSHVXGjHdAdix+whVBHIzSg+o3c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=mVFvsv63; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QO2E8odC; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="mVFvsv63"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QO2E8odC" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4B26Wx6G008613; Mon, 2 Dec 2024 11:20:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=gu5rp6izD+8+WzSVsE54VGcO9SoZjm2fsgBW0upSi7Q=; b= mVFvsv63hh9MpsgSqzjHtenCcUl0DQ4OClWAi1PEJUZqvqsin7iSykxtwL8nVpt9 4isx1/pw9t6SVmp0Hkvr95ToRexJNhGjB62D6PUOZEm6N4neEPlVwqhlEts5o3qQ PrI9SYpGeijVmEHRcQeo3fEdwjaNfXgfrfRTotV/htxbtg8GLbZR0SjX/vL3dWAD fE6Q/kWmtfzqhUE5A1cawCfCqmS/b/6mUPlDmFd50+sWJEGENP6mgGjbJUvy6vyf ZE+hB6f25jEthSuQE0qxGAzvaCZUafcawVg4w/KEFGnGVURO2LN7x1ubB9q0ixF4 T92nbJaLfcOlB0lhegMiUQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 437s9ytm97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 Dec 2024 11:20:27 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 4B296FjP031023; Mon, 2 Dec 2024 11:20:25 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2170.outbound.protection.outlook.com [104.47.57.170]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 437wjavbm3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 Dec 2024 11:20:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ccl6wHPmIhm8LUQqnOr4P1QVQ8r67kK593OmM10fYztH665zdUNkan72cl8iE84sn3KyHn/3tUasWiuty2r/mtfi5AF5XyyHNOjRRFzcESpXyUHffVVhlYuRmMOsvW+LoJxJZLYNY6e6+aVJKfAgUfirD4VPQHZLBvNuTjbAA9wiEOYKPzEUeKa9Sl3BbRciXLDKqbZXOefd6iwzEytRTSpcTKuZhEufsVdJawOwgyxzbPMuraUx7RRi5ZdAT4Z/VZvSPmrHhvRdcT3bi1RCO98YX9fHJK21MpBqZwB63q7SIRnLO4/pBfy8GacmeuQnjy0bxaIhDcUD0EjD7f7b7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gu5rp6izD+8+WzSVsE54VGcO9SoZjm2fsgBW0upSi7Q=; b=JQKCkboCYaAWo7Dimbwzm/pF3oYQ1dOVXGgBliGElACOpD/MZT74+T25BsawiDKpSW7zTU3vo3J+iH+kxlbdoz9icDg1LSBOslURgbp15VIUJlGY0U1yu/oY9IYANNwel0pLaVDNtwxDd+KeKIVESZd5+DQTNJv0ppiBIEc66hia25d/NiRqYQSXxrwTVhyuaMdzp9FgApH9ACyI5P2TTjaqg3SYYOniengL9+oFHwpQZQx8OIjus5z1MR+NIztpsbXmqhSpIaJk/dmJcRTOtMDu5AdWG34n6o8QPctdh8Dqm9GhkwSqmCMGWPyjZ/nBVHFQaGBBJL9/JEddUDC+1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gu5rp6izD+8+WzSVsE54VGcO9SoZjm2fsgBW0upSi7Q=; b=QO2E8odC5XN3j4GVSNrRKfb1qX8nZzspdacS0GbImCYk+03GV5MXKVLyDq1a9s7CQEVBu73r1j4dDLNvVnp1XenNDBaFnaXnhW8I1aDO1pi6eovAr0jNq5Tdr9NOKjiOhQ7EuepWlaRMN9zwm3Kwx0sisDogQiPYV6vc17JZZ14= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4728.namprd10.prod.outlook.com (2603:10b6:510:3b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Mon, 2 Dec 2024 11:20:23 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%4]) with mapi id 15.20.8207.017; Mon, 2 Dec 2024 11:20:23 +0000 From: John Garry To: axboe@kernel.dk Cc: haris.iqbal@ionos.com, jinpu.wang@ionos.com, colyli@suse.de, kent.overstreet@linux.dev, agk@redhat.com, snitzer@kernel.org, mpatocka@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, hch@lst.de, John Garry Subject: [PATCH 1/2] block: Delete bio_prio() Date: Mon, 2 Dec 2024 11:19:56 +0000 Message-Id: <20241202111957.2311683-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20241202111957.2311683-1-john.g.garry@oracle.com> References: <20241202111957.2311683-1-john.g.garry@oracle.com> X-ClientProxiedBy: BN9PR03CA0597.namprd03.prod.outlook.com (2603:10b6:408:10d::32) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH0PR10MB4728:EE_ X-MS-Office365-Filtering-Correlation-Id: e4699b53-f3c1-4afd-58e7-08dd12c3508e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: fylHyb39j2xAVd1C7vrj9u/z/fdaMbJ1d9HYA56fDlTXnOxC72GtR8LZP08p0cNr6+/lAXnj32Co6B7jjIRiesPkZve+svwgS6bG2pMip0rm+0LrCbcWudiFGtAHGZwrASPdZvhl1USFGhw+0U+4KC0hKcl53FvfjTCqqUHRRPwKFIcztawomdA+s5fE+r7uL3fWyUjCKbqCWB5P7PyG9mlxbm93M5q7hHUfoRPA0PtP2sa1Rd57Sc6+FiGdJ3M2EETta8lUW010W5p3vinbMpXJ+ZEsMKbx+ydvg8edLipagnWKfcMrCWet5Nf5ep7BaF6sZtRXnQowz1Ezd9gWMDBEctViULlQCH8iKX+Ob44ULqxKKZWP9YX8pQaUB2nUGffFkmzpC1xv/AyaNzU8FsmzQlCZBsl8YFxN94BJ1QphB3OCmKfbvrvk4WFQKJro9+EoQ8iPURXO8ASsZ9LA5FcqrXU1z83nZQ+oIuhMxgpZCJ6nwkPew6+4sB0AMscADappSPFT5AzWqo1RtUT6s8LvsaaXySelTHGvTRbXqbVte4WwbtteWQnHqQiR7hq3afRoQfiBGE6DR8TUPVGTK7cYWzpgB0gy8wx8DHKB0CDPoD/4L4fb8mpRWa4kXO3dBSCFyp5YrAtAei/crPTbyv5AiDYgYPn8/ik206r0qNKtPkitc3C8izWAbXc8nVUOArbrdldNCxoy8Dro/bXtr0qTDBNz1ziOYrMoIhWshetk1Ez02U50ggBOpqeuUivfaJUDy8h2Vf840hC4Vst/+pnkfgpT3rosuMY0SQym8AOAHk9jt/CoWZZdGSpVNhQ++DzdYlTkUFnvOL52dnWGnqJqHd777vF28ij/kxMBkqY5tzVVFSZywif0Zch2dnTrE4n3iDEU0gHXfMH1ajkl9uZs41i3MI6D1zQ19/zhSqoE22v53jc+WjvbKiTkW/VsrtvdCsPPOKAR0OKLynkwBBQgpEwDoO9XcFCZ3utGOZYhbRA2sD1+ayFl0vWDZx2pzJDsgIuGmTGVm3sefPS0IWED/1OSTg2aoHlh/ytsWjr+kC6GMyHQTZR8q8af5Iq/OAvBGbCeOnmSqtOcxIHqd/8G6PuxHgoPUQEonnkqTfRvM9eFKEVO5CX4mvwDoje3kzRq8iArjPkGBfG+2OZ+zxPAZiBKbqoJZey4DyBWo/AI7vvqDasGWAWtFRn4WTOWCUIzOQajS7o0NJYCAnMkU9FjE480UJE3cZlsbixu36YExWVvHs9ZgEWAaXOQbQ3eszRtGDidDk9uhsjL3Hy0tJSiLeSgmU1aJ9HRpmsFgJv3AwhWihLl6HIGjJJhGZwekgVLYCuR0mHPQfejaYftgg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fuq1P8nB6jLoX02s5IaUMeZamtc7hgTcUH0Y5BdCYSYricHKIG1St0rQhDRmi+2ucOguTX0CbedJfrSc1VOqKJsqpbELtw+povbjDvfY3/jIdLwcdM8ShpyW/Ny0CE6HPVN5mGuK8+6dMK3wC1DccBgrwLwxyoohRtNpHB8hw8u91eyOJUlCfeuBFT2FNCTVxpxStdENY+0parG1g3sDZLmhCFVJtQMz2qi8w7luaYjMleauePJsX/NAqEqmvY22AayN+aB4YOybGV51zwLXlxqsVVzuXmCAKseS0qvPZFgg1MxFM/Qp/ZvqV9Sf44E58K7t2UQLPFVXCKau43ZgyUbPlI8X+JslfeXYT+g3kK+cEUFA3CdhENy1U8KZvArFAoCZ3LZmjIJ3PGSALJhxkaS0J3HPigRDcycM/K8wPvXs4psVr6vgvyOWZxXQSYZZ7FwzEA+KcrQTXP8P1674F7T9/gsgzE0JER4SrOQ5KhCQ2NUaSJQ+3Z9/k6+65egHVzgZI/GM6oWVvfq++JkxWS0TBK/o274agNkImvU4iAKBHEu8TY1Egh3C3+BIe2iJ/8ZpcgCnIwWmBaQY+pj1icLM2dI4e98pMDnhDCE0x7qmSnmIOF0uogWGVvSVMkO7cyHIqkqzMDqzoNZ5app+UH9NmQY+2eXseIChGk6Pu7wzKfEkeXGdsIf0hdbE6tR+rcsKSxSvlk9+F9W/BFJ+eLAbvVACChL4I/hnSdrcwWz9RAVbwlHR2VYJA1s8RURmvnkHEp8dyo7YI/RdEMP7KvFsYFjjRCqebzc76RBIosxCccapvhtiJm1GAIRW/Ld9pU9IrEyxVDGGDb9LE9f+WE0FHDkD9302GtvB2zMXmLefMWZA8L86hvOz4VrN3gjVPIx4z2XSlYCqpkCBrmJfbjhi2LRJshA/Pze/AWFbUZfNrnQA7cpZ1L4U5CpSlBhCk4dm7PYhWIR7E/2PowYUBDC30ujVbugMpl+KcGRn3D//nNclYh0bAdTSqeiqbBYqy+PzjDWVxxEZmDtZOIN7BlOIvOP5OAsh+WDntJ2H+6e3zZFRnWIaNLCUwqsE0m3COAF/9t7XHmXjvHkIBL3HXBFD9z7+7MVzboWKoXHkunjCkH0gcgmqxL7FE1cFkRhlEyvws22aX7L6c3yqRGXgDufhEgO8oFM17obbYN14OdSfI3PbgyLkcgF1MUrf4ZohOiQZrhVk//p4o0IE8KhU9Exk3tMe00PBX8NZ8g2r5jPWZdqZJrVChu8hXknBBsYSNQXa4J3I/dVjOfxOTW44WOO0QGMslZm2MyOOiR+V29d3G1MsPQ+UzKt6+9yQJdnmICYHHlZ4xhjejyY1rCFvJ5Y7FrZg2BHieZyhp2c+HL6CHVLLmQXpXS7yviKq33v6Rl6bRlWue0ukDhBn4ClZKnBLfzsRrz1B8sdxwIX1aZ5qH8K38ag1sEIXr3WTll+6TPw9TA/7lMQ3K/4lZgun6UOCUMMpN4tu33E4cZAbD2Pw/iW5XyMACkFvcN5evRf58KCBlLmS2JhMsdrOIQQ0r5Tc7PUNPvPALq4PbV6pTtzzgEHNAnvLyn4HwqRG92QbzRDJKVOjrDxkALKJQzXWSw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VHWIrYs8y/m2o2KZBStlmwJxXf+cYlbtIvN0JIy97WVTIIYpla0wE6tqGsk1WRcwyRd8mdCg22KfsxU4f+gMAR9nm1xBuwUlyMHtjQQkUKtGiI9P31leRl2hzEoRU0I7C2zFlMcm4U2nJSqYFlSm341cXtXUrYhc7QOLxYfF9oP5jD2kvNyl7iutaPIfbp29oYBdTtNffn0srjc1o++b6wvqBQUU9V7RRAKwU7XHdhNBHS81ofQ52By59DHq3wvupelW+TdRil8YK/kCxkb2rp0M9cx6CA68w//klRWHNIETLuY0mXwkisShAQgtxoon9qFpEIaFZ1FcSzk7uMCUooK6DxnJEtVpwghyFvybOChcSLxDeycLxusdCMJVlbVnXGyoFiHKQUQmR0SjduBH96+bZr2l35h1NJdfWO/tXftUnLzOicSz1ds/FdA7I5NhRCUBVAPcLtKBcoH5BKXwMw051myVPu/LqcXGaCHwXg350utbIlwOBtccni7ShcLigEBy4y5fKJSA0SB71e94Ws3ah1tQlNO/HbGzOKVVLMepk6OZjG/qEUUhnRdYgh293N8/kyAyfKh3W5YbdPJSXKvVThL/rq1Os0Ia5AzCli8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4699b53-f3c1-4afd-58e7-08dd12c3508e X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2024 11:20:23.7285 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vQcxPgcivaHvGkbAMZl7vjcc89GQlWgd3RkPvilF/i3I2NSoGno0Xe+DUYHaBBWD3/hWfqGAez1M/Z44Wo/XCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4728 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-02_06,2024-12-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2412020100 X-Proofpoint-GUID: dZ_zF2koOwlnvmUZao7wcpdtbZV8bkap X-Proofpoint-ORIG-GUID: dZ_zF2koOwlnvmUZao7wcpdtbZV8bkap Since commit 43b62ce3ff0a ("block: move bio io prio to a new field"), macro bio_prio() does nothing but return the value in bio->bi_ioprio. Most other places just read bio->bi_ioprio directly, so replace bi_ioprio() callsites with reading bio->bi_ioprio directly and delete that macro. Signed-off-by: John Garry --- drivers/md/dm-verity-fec.c | 6 +++--- drivers/md/dm-verity-target.c | 4 ++-- include/linux/bio.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 62b1a44b8dd2..b0ee199009fc 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -132,7 +132,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_io *io, u8 *par, *block; struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size); - par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio_prio(bio)); + par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio); if (IS_ERR(par)) return PTR_ERR(par); @@ -160,7 +160,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_io *io, if (offset >= v->fec->io_size) { dm_bufio_release(buf); - par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio_prio(bio)); + par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio); if (IS_ERR(par)) return PTR_ERR(par); } @@ -250,7 +250,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, bufio = v->bufio; } - bbuf = dm_bufio_read_with_ioprio(bufio, block, &buf, bio_prio(bio)); + bbuf = dm_bufio_read_with_ioprio(bufio, block, &buf, bio->bi_ioprio); if (IS_ERR(bbuf)) { DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld", v->data_dev->name, diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index 47d595f6a76e..e86c1431b108 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -321,7 +321,7 @@ static int verity_verify_level(struct dm_verity *v, struct dm_verity_io *io, } } else { data = dm_bufio_read_with_ioprio(v->bufio, hash_block, - &buf, bio_prio(bio)); + &buf, bio->bi_ioprio); } if (IS_ERR(data)) @@ -789,7 +789,7 @@ static int verity_map(struct dm_target *ti, struct bio *bio) verity_fec_init_io(io); - verity_submit_prefetch(v, io, bio_prio(bio)); + verity_submit_prefetch(v, io, bio->bi_ioprio); submit_bio_noacct(bio); diff --git a/include/linux/bio.h b/include/linux/bio.h index 60830a6a5939..61e6db44d464 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -19,7 +19,6 @@ static inline unsigned int bio_max_segs(unsigned int nr_segs) return min(nr_segs, BIO_MAX_VECS); } -#define bio_prio(bio) (bio)->bi_ioprio #define bio_set_prio(bio, prio) ((bio)->bi_ioprio = prio) #define bio_iter_iovec(bio, iter) \ From patchwork Mon Dec 2 11:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13890294 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52CD6209666; Mon, 2 Dec 2024 11:20:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138453; cv=fail; b=P+zXjjPmyOmvrWfaax4Aq0nW8eNomwULJYGiktVvm0/+sfltEPQY7SMwTRGO1mKx8ftrMAQycRPIsZ3ESu8xQZJntMIcYsMScsCDGN2y2iNrsdOLmSIzPdiS3md9qoM/dRsqG+HNfixjoE5J6I4vVanHpPtL1+lpzwU9Mxv7EGQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733138453; c=relaxed/simple; bh=Hch1TKXC8Voj8NwJTSnJyynhqePBiF3s9AGX+F3CrfQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=TJ3KG8ldxotb9Nt6DEhrht/P5Ibk7ova5jPFqbSIFTC6EQO0Q470xpSo2Sxqj7NN5M0xmtxJlBlPyhToYBoroGZ496vi1GFxRu7XTkgmTE86X590PUCmZ4rUcCR0Lh55YO5gz9G1YzMige5c9FEJLYYEyPCqsQW2rB6IVsemvh0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=LGmEWgeo; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=PZD0VZur; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="LGmEWgeo"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="PZD0VZur" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4B26WxFJ015031; Mon, 2 Dec 2024 11:20:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=rkx9dXnkSsPVlEU9j7w4UiMEakhiBxgGjW6xPzOuwtE=; b= LGmEWgeoYjIsOwvM0klnZ73J66t1Eyue4/eHdl0nVDbQs/cfWQ5kPfFf5UyQZdHF cINDzgOsx4QGtChai+aci2+bvhug6NlET3Kush/upJIJPeng9gZiKEza79MJL81/ obymCIad416IYHnj6pcu2F3Az/kchtAezK6Mzfy3+6v1Rw5SM8cBKA2WTvzqSguM fsFTQOIS2D3BDouKVp0F83alCWjRYZUi6Jh8oIeD6DQkOPLxu9HhXm4xYynoq8Ez j6AKD4ALEitRf0AsweyX1PSVJLuGNiT30NYWKvPOjQ1dqfV8jmRyIcQyaRNLcAG5 PY5b7khCXH6Zd3sIzhjF6A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 437smaan4c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 Dec 2024 11:20:28 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 4B2AJJZP032114; Mon, 2 Dec 2024 11:20:27 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 437s56evge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 Dec 2024 11:20:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=reQQexTtM5MvyMi6oIiMKOAU9zfRrE6g7f80CSm3iq0YpFEBzWQecQuDNNvnB+BXYl8GYCdKH53q5Q5XE4d02SRkvYtEKc84AhzdzadhnihPsWeFkwGj/gK0NV4DN5sE584/hz2LBL0XfdsLti7vUhiEf2R7dAPCDf4s/BMAeBepLdQKLlxqoe0oreiFZmaavGfWvV/IA3Z/Mdeq1LpBcsMdAQZ2WVB15nFwZOzysUA+P0uLW7lDgsTJI/CyQ9bzv7JiJBv7SBmDh4K2RqgCvkmsfb3CbVPE4yBPfgvsKmRK+fRuco9TapWD0YM2fPVdl5grQAaz/+M5pG2ZiMyq+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rkx9dXnkSsPVlEU9j7w4UiMEakhiBxgGjW6xPzOuwtE=; b=hNsy7IHxJb/uvCdJvSKglzjI+jrzYhcROZRdrAcE+8gIYm9gNLWsCkMPD5rFhwAugEpGMgo6MZm9Hirvu/T/8nH7Dho5F70w31GuX2hp8SBVv7FBE/IkhUOTCjCtVCd44Ulg7IMdTjSZG6Ifhrt/ZKiipObK6E2B30l7JG5N6s4hTVeOFefGuq5DFKRFt8+prqWL6ZPIux6J3rIbAilCtbJIUnYFFxYiq7OoIppvpI9yAbB64qxpYkW9SRo1CThjz7GceVlVBeZ0GM6q6Rc9FvNbWvKRk25K5SbSdKRHi1ypN5iseeY2YZn7mgSF3KqaXGleV1/Exe6vJsaXvL5TTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rkx9dXnkSsPVlEU9j7w4UiMEakhiBxgGjW6xPzOuwtE=; b=PZD0VZurdNcDcyALwuf3fl/ByKP0PDAw3vRp8owse3IONX0kLbWpiPxKHOZhcJdrpypGQKpYjagzO6eJXnnao9NOVsevF1l9lWg5rO5picco1Qvl08t4I4/kbsMdHZKgiUZd/21hD4lkn8sURsv5YzS0Yq9UALdo9tP31/hlocg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4728.namprd10.prod.outlook.com (2603:10b6:510:3b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Mon, 2 Dec 2024 11:20:25 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%4]) with mapi id 15.20.8207.017; Mon, 2 Dec 2024 11:20:25 +0000 From: John Garry To: axboe@kernel.dk Cc: haris.iqbal@ionos.com, jinpu.wang@ionos.com, colyli@suse.de, kent.overstreet@linux.dev, agk@redhat.com, snitzer@kernel.org, mpatocka@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org, dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org, hch@lst.de, John Garry Subject: [PATCH 2/2] block: Delete bio_set_prio() Date: Mon, 2 Dec 2024 11:19:57 +0000 Message-Id: <20241202111957.2311683-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20241202111957.2311683-1-john.g.garry@oracle.com> References: <20241202111957.2311683-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0010.namprd03.prod.outlook.com (2603:10b6:208:32b::15) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH0PR10MB4728:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cbae3f6-a942-4076-21d6-08dd12c35169 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: 2gdY0KG9ulmUEzVCuZzNezornUFRvjP5YNQu/+H6jVMC6yss2mjYdTK6Fb/VdJzlis92lREQ3bm9gwBnxjTBMUDD+MEl1fHdHae5LbZ95WZhf8WtZVAdoOSRXsJ63gCcnMk13jC0wq3f0WZ8nOphOOJs2Lpz9R8GRIgNCXl5ogSjh9CSXYkh408ovLRrYH8MCdX6nim9Bt0fBayzQeVreSFTT397WWLLvasD21Z/hV2zHfzj+SXEHmJmWzKnao6UHKFGvR/22sRP7LaYYzy3hgjLNqOj9Hymtv2RUty7M3S4Lo2+DjQg9rRyku6AgQJuu3g1cJeklceSQLAtUcodxyW8/Zbu8SysoIiohK3zCcxSou12npXCH0P8zvRpRIzhpMWbpTNOSv6HsMrTiQrmmoQsfp8HVdOBwZb4WNYsuGhUPCaOVknp5FyMyrXYAm/mj+rX9CGRGc8kYIEascuPwVB492M/ZDtpsVQayAW0TKu0OWL4RvRVJt0txkc03cnsrPxxMQ/6PMw7/4ZsbJ0zEIQW4XKjg1fe5JzyXtykiu9B7p5Oe4j+fXC/3mp45KQ4XG6EHsck6GUiDZUtPyLoKs1HVV3HZYg+XQ3bgbjbIhmWWRYpQwawfbXl/LOo0+K5EgnpzvfUdi2G5JwAWVIZRazRrYoNjtSeq4ALMdSddeQNDw0IuO6Et9EA5TgHKEbrvPWwlBRyGUVPajL6OqYBO32ckNd3zDdtf/JVZxdzXmbFAAR9KwqyFFokIq7wpnihT7ndsKJujSba+faWsm6jqGf0pbEQmw3R4v787247Bj3Rfxo9ra+ff/gLCdHhy6jOd5TZuZIytnA+W1k1hubo7QL4BzatKkOIujXobHBlrk089bxp54wpbqeKgr/HDYQNPwAfGLmKCq167M6tXQzUP7h+nhmxYofI4WJj+a5HFcmgq8A7FMJQdKkmIvM97DVPeed9R39VluVeJl5ycNutMOT6Z1+B6v4KbTdznqNFAUo4nzJPNy101LwXak2rBzZm7Cdi+wXOQ9HOzyYXBLMPk2aJ2Yx1ln6RQK7UC0FIsWY9KNWPtswNIjje/0qOJaOaetsyp+Ubg9kG4hqDBo+2ggwe/qifCWU/e8H9xc62Ii5Ygs9QQDrFPdCOZj7DnVX6F99o5j9lW4ejBjZ4Ho+WOhrBr5KKmug2A4gNFCr5Za9PyCUxTljW9usgyMwtNg5VohNYNMyxJa+ZDb7REU/D4AiyPfxvCvPwSKIUt0zWfxE8q7xCMONV3I30mvSGQVTn2YkQI/2C/FozoXRLx1umb4BEC5GYGiLiKykugJWkQId+D2WS+La0YIw86n7aQKg7QtRqgXss2RFcdVOjavmMpw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e9E2654xrGWJX9FlKesAwz7Sj/RdZmQXFusq7wIiejzTJDPnmgU/gXccrDTrDfvzSHu+qGnrR2Y95uep/6joUJQTTxhA7o8cQYHSYVl4ZcVsYCDKS4r5Qc9KDBXM2mEsSS20X7NkLkHsGE1Of2mtkaDZUTbYEcVkpw3SJw5Ecn4K+Cpbn7m1ybLEoSzPgRkmTDg6HrmqjCmi6xBrvMzVy6Y7dyEo+chVhUAKHWm1QuuTMQj22vJ84dPv2saYrKfjzYMC/YU2gJ+8FKYABqIiu/xxKwjfE/hntpYlgZte6zmYo22mE1b/H8Zd5JOhrcILTTmJY909C8PinFgKQqXrAYejcR38QPh/NXRszovT0ZBMxIPCAjexvhS16igYWqiPI//vh48DfwUU1k4cIM9SFr+TYjFGoRGpFIYGZNNB5/NNTTjiuyfHQn6SBlsTL5NBLHIyJM2afFOjHvOnDVerumoaFCTprZlUsXnspOuy2QfAACRfKBnYCybsggE/yWKUoMZLFNeybOA4tOrCcgYZVl3XGqGDp00c8DDPzv3eVwEeIWiFyOwb4vxdq5UdySIGRxql6hMojDho8haFBqpIuV/gIOrHxrajAEBlZrmwIJ4NPZS059Htgltf0RlM6rSNf3bGEg174Kdw6q/7qKlPrkQiUaiPpLLsQuCfF0WEb6D5wANlzwOw3fOZWvml6zzoqaem+ONsJnmeDid94CTl/aJ8u6J5+tzfK9WIbgsPu1GhxFk2tbj6PN7HWe4YUZwrxcc3B96ISTH5PB6UnWfeufp5feKGDuyFsbNWTJrZ+epN/faInHULoaWBjVAaWbKnnDQSWxBMvJ7FOkHFnZxqgnJfG8PVGGewpE6tH2beqTkho/YR2eyyZR5XK9nsonjaElVMxEjXLenTBonc+pEs2WxYE4+djHW37ubjQMVRcSt5TMDE7//qUQ//N/JwmGQhFvayztIniLV16almZClzfFrgsuYGGnZ9LRxrPVTCptz64Sabt4uRCwgxpTZs6NMGFR4Qb5ECxjg5SqpkEOiu2C1JCExEatwnL3MCPk8bRWzfYVhvbod7Y+6JbpUQ8n3o6aYgT2izPFdF6LUJ26fvCawyiNnfjnC/zAo1XEbh2DArMzk79q/uF0m5Kw+BSJwo++NxaSCV8Qhb+NUX4Je6gpaaWFcxTlplGlqk9QX/oBc7CT/hUSjjvYVqyJWvByJaAV5ctorLh8+nV68cllhhUNpNsh2FJb2FSTrSlXHOewQCbn7zgwBSgwuZDlr+6d14SzWraWqKwbuQp8KvTk/MP8PqIsTm4KkL3TBKccjhgRcOTicgRXAeK9PJ4BBn7IQ/kgRpS6wq4vsZr7KjAXJCbpxj3kz7F0EH2/lWSrF6PTmQTfFKPPX4m6Vl/8S/GLC8Fr2ScJdUfo9MumhLtwnast0aquurpUXgNA9bi/yZw1Z/xN1TPnbPRC7iAcQEo54YCJJoDTfDgZM7yv56b3/OcJIzBh0tb5jFKksXqtiCQdCGPTEjcuVU7TO6h9kOdsvIpJ/qNFdLUeGvKG4FFkHvls0twtpTzpr7fIsF/ISyVABnmd7XiI+nRGApKMw6ZkvH X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MlGHA1kYmf95QEO0VJL9053mi+ZlCDRSw596a/qosQDGPDqR0FEck57PbprMAhEhU57XalVtBq5hAR6cAKEyJzGW3IIzin42BaGVioh9A0B7W5v2aG9dyQduUDXE9pn95HcsDdV8Ef5ARK1FUBxJwJx1vKl2v4PawB9KhyRjD5glKdcOe0pCZHHpqC6NBSL0wzn0o0kyII63H6FcWcQhsTwiRu+5538XVCXXqfuS2plB57I3cQ5/Y8MESEXC0TnxoxqxXonrZ9+8QPPjm4cRK+wMXwu3URr7CAx2sIAqlRyDDHS1CK6EVFaCwtVfuE4mgcwXMU5VmL2s0j5YM0We6Bc8133oyp2ylDnx7N/2XEDtSN+eI2HPzFtCMkN66xQ4OFcjOg5/QSt+aKGfs9IFFq+UIw71OfCmjjHzaCapbUYPp1pSBd+xG/MIPSsrJ5sVc0OL5Mo4MMXVgGVigeG4vHqDyUe64b3PBAJmzs9pd0/WWBC7l78vLaQYrL7dZCmNI1D8+aGJmwfsC9nKFGA2sIs5c/IzxftXcJCKZZJbimkUfiCJ1LxbOlbkClTEe8qZqKTrXIKCONQJmXDQ+7cdg6oN+sTNSKYF/gxN96N8Qto= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cbae3f6-a942-4076-21d6-08dd12c35169 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2024 11:20:25.1434 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SM3QkKaR05iq5AnCQxEkDhK3az6wA+mI0wgEVZPT4BjrsDFqnenRoB8XSmvh3dyIsgiL6nGhoBgvM3s+bDw9Eg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4728 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-02_06,2024-12-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2412020100 X-Proofpoint-ORIG-GUID: Y-BwjOAroR6AoEWDwX3nQ3VzfkcwmUGk X-Proofpoint-GUID: Y-BwjOAroR6AoEWDwX3nQ3VzfkcwmUGk Since commit 43b62ce3ff0a ("block: move bio io prio to a new field"), macro bio_set_prio() does nothing but set bio->bi_ioprio. All other places just set bio->bi_ioprio directly, so replace bio_set_prio() remaining callsites with setting bio->bi_ioprio directly and delete that macro. Signed-off-by: John Garry Acked-by: Jack Wang --- drivers/block/rnbd/rnbd-srv.c | 2 +- drivers/md/bcache/movinggc.c | 2 +- drivers/md/bcache/writeback.c | 2 +- fs/bcachefs/move.c | 6 +++--- include/linux/bio.h | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c index 08ce6d96d04c..2ee6e9bd4e28 100644 --- a/drivers/block/rnbd/rnbd-srv.c +++ b/drivers/block/rnbd/rnbd-srv.c @@ -167,7 +167,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess, bio->bi_iter.bi_sector = le64_to_cpu(msg->sector); prio = srv_sess->ver < RNBD_PROTO_VER_MAJOR || usrlen < sizeof(*msg) ? 0 : le16_to_cpu(msg->prio); - bio_set_prio(bio, prio); + bio->bi_ioprio = prio; submit_bio(bio); diff --git a/drivers/md/bcache/movinggc.c b/drivers/md/bcache/movinggc.c index ef6abf33f926..45ca134cbf02 100644 --- a/drivers/md/bcache/movinggc.c +++ b/drivers/md/bcache/movinggc.c @@ -82,7 +82,7 @@ static void moving_init(struct moving_io *io) bio_init(bio, NULL, bio->bi_inline_vecs, DIV_ROUND_UP(KEY_SIZE(&io->w->key), PAGE_SECTORS), 0); bio_get(bio); - bio_set_prio(bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0)); + bio->bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0); bio->bi_iter.bi_size = KEY_SIZE(&io->w->key) << 9; bio->bi_private = &io->cl; diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index c1d28e365910..453efbbdc8ee 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c @@ -334,7 +334,7 @@ static void dirty_init(struct keybuf_key *w) bio_init(bio, NULL, bio->bi_inline_vecs, DIV_ROUND_UP(KEY_SIZE(&w->key), PAGE_SECTORS), 0); if (!io->dc->writeback_percent) - bio_set_prio(bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0)); + bio->bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0); bio->bi_iter.bi_size = KEY_SIZE(&w->key) << 9; bio->bi_private = w; diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 0ef4a86850bb..67fb651f4af4 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -292,8 +292,8 @@ int bch2_move_extent(struct moving_context *ctxt, io->write_sectors = k.k->size; bio_init(&io->write.op.wbio.bio, NULL, io->bi_inline_vecs, pages, 0); - bio_set_prio(&io->write.op.wbio.bio, - IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0)); + io->write.op.wbio.bio.bi_ioprio = + IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0); if (bch2_bio_alloc_pages(&io->write.op.wbio.bio, sectors << 9, GFP_KERNEL)) @@ -303,7 +303,7 @@ int bch2_move_extent(struct moving_context *ctxt, io->rbio.opts = io_opts; bio_init(&io->rbio.bio, NULL, io->bi_inline_vecs, pages, 0); io->rbio.bio.bi_vcnt = pages; - bio_set_prio(&io->rbio.bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0)); + io->rbio.bio.bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0); io->rbio.bio.bi_iter.bi_size = sectors << 9; io->rbio.bio.bi_opf = REQ_OP_READ; diff --git a/include/linux/bio.h b/include/linux/bio.h index 61e6db44d464..2e7bd5d66ef4 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -19,8 +19,6 @@ static inline unsigned int bio_max_segs(unsigned int nr_segs) return min(nr_segs, BIO_MAX_VECS); } -#define bio_set_prio(bio, prio) ((bio)->bi_ioprio = prio) - #define bio_iter_iovec(bio, iter) \ bvec_iter_bvec((bio)->bi_io_vec, (iter))