Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36051C433F5 for ; Tue, 5 Oct 2021 04:49:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0AF8E60F6B for ; Tue, 5 Oct 2021 04:49:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230403AbhJEEvI (ORCPT ); Tue, 5 Oct 2021 00:51:08 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:45966 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229955AbhJEEvH (ORCPT ); Tue, 5 Oct 2021 00:51:07 -0400 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19531d7Y019258; Tue, 5 Oct 2021 04:49:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : references : from : message-id : date : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=mdG39q5fOOliHe9mIe6lKeng0Y9j2L9HtcrUs9fQbq8=; b=ZSZcUg/PPk04VjO8JrcQ5s52z0F28Ml5lDU3tGTcuqQuVDGF7eMLn579Cyo/8RluckyI lVKe7KYjA5bsrLNM4Siwq1qXKzthwL5ts1FUBN4q+KamlSgzzGVshGV8Yo4TF4aK7gCo BEp7KYpKiYAy3SPkctv6q3F53qK8+Eh548xWRwo86+LVrQjehF0c4MYQC8qI0qfoQx52 NLDgSfYS8iSnPjtwSqMsvB9yDOz6q2UnnPy8lKdMHQ0tLLmLwmjmF2sMMkqoVRZsE1Rs zxjKMeH9GpFVTtXpp2b/BRpAZZmAa3XuofXqVhDge9nS2FXkHFGhyPJzvHwwxs7U3h6h lg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bg3p5cycd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 04:49:14 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1954Ud0K029867; Tue, 5 Oct 2021 04:48:54 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2045.outbound.protection.outlook.com [104.47.57.45]) by userp3020.oracle.com with ESMTP id 3bf16sed9e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 04:48:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XJuu1nurjo3L7UXekX4pPos8aErMd8dkOcjSo7XQNL1evHSr9pfnSn0fWTGW9wSzScmMGEOI5f+zw3/KPM58QVhS8LR+PtYR1EMnZwAM2c1SMo01OCjBuiVXdz7Dnyai81aGXaxbhLA1y39X6yKUo7eKKIiMdeiEJEvnBF0LfeGdQarnQ2jySPwgVPv0mpyVab2s8+GMXPG/BWjqMX2sCdpS/yl/qSq4HPTFjpQ90zJbIxz16r/wcpylLkV5MpwWHyZBbr2DvMmmatLuDLrcCTxzU/sgYXlIBbUujPWS58F7cAJ3Tc8+RleEb+2GmrUKxRgQmOjp6hmcagKfu4nODA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=mdG39q5fOOliHe9mIe6lKeng0Y9j2L9HtcrUs9fQbq8=; b=WF4KT1daJ8AgedHfW+T2KKGAHbQM1+W42sJz9f3VQbavu4SuG1SprPmtRkbOI4RMTi8hLqjOlDQHW0UmDsEYv/8CKphBFkcTjFm0pbG6c2N/NwyzJ+WrkGKlxvn63j2/19CQsNDoueAMM88MkUnHXMTvol4RE4Pv3yU8Y3rRO/P1z0BvAaSFU7s/HBwVYD0/CdWwENjrYyFrE3vQpEJ6BlVwY/nTxup5wQJg8LVggr5gEskfc8Gg+9vjEvBYb0Vc192rcMCzgkiTv7yh+psA09bCeSIQX1aTqOIzvYH61OoFR7g570imjnD1fxx+xSzV+t7l7BOdQiZve5no7EBxkQ== 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=mdG39q5fOOliHe9mIe6lKeng0Y9j2L9HtcrUs9fQbq8=; b=lKxujuB4fmUnWbsHx2Z1+jlRIVoELjuwIXHAIlzFb4hAPWe8/E3guO7nFHY2/09fsiFw9qbzT+nt5jM4Qey2MsemIMR81I1YS0TizOp6R7DqS8PKl9O1z7k5MP2N7RL3eQus834CFOwMRILVg+oiGf1dM3vOWq3Mj6QahohZv/I= Authentication-Results: fb.com; dkim=none (message not signed) header.d=none;fb.com; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BLAPR10MB4980.namprd10.prod.outlook.com (2603:10b6:208:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Tue, 5 Oct 2021 04:48:52 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::49a5:5188:b83d:b6c9]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::49a5:5188:b83d:b6c9%8]) with mapi id 15.20.4566.022; Tue, 5 Oct 2021 04:48:52 +0000 Subject: Re: [PATCH v3 4/6] btrfs: handle device lookup with btrfs_dev_lookup_args To: Josef Bacik , linux-btrfs@vger.kernel.org, kernel-team@fb.com References: <5fb28919a4034e6ebd0c677e5bb1b52bf8fb4fdd.1633367810.git.josef@toxicpanda.com> From: Anand Jain Message-ID: <15a261ef-df68-41ee-7cf4-494b11c38b01@oracle.com> Date: Tue, 5 Oct 2021 12:48:43 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: <5fb28919a4034e6ebd0c677e5bb1b52bf8fb4fdd.1633367810.git.josef@toxicpanda.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SG2PR01CA0107.apcprd01.prod.exchangelabs.com (2603:1096:3:15::33) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 Received: from [192.168.10.100] (39.109.140.76) by SG2PR01CA0107.apcprd01.prod.exchangelabs.com (2603:1096:3:15::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Tue, 5 Oct 2021 04:48:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6576a431-814e-4b04-d9b5-08d987bb6da0 X-MS-TrafficTypeDiagnostic: BLAPR10MB4980: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1079; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hkLebSImteOF4WK2KlQ7FNDBwjBoZEDuTf03bTsnrKReUlO1UxV21sFJ9b0iZQoi4Ji9AWQRSzPjFAhuYwzxIuPNpMTxOUcT6dqZorYv0JUiIgWfXB0OPSrqQUfdRzXUIfkev+qJAJaA5C3TopQ6DyxcYfsEJIoAQiE6mVHLle6TKt0z2+7mOsFTmQU70Fypq76OjCwmrPWbd38hXxmhqnBdh9vG3U2GpFXkMKRgpxiKN3zAzWlch+5+UH9rtOaZsRzeiv2q/hZuGwavdEKJu2MsXf5GP2L9YB2bg8WAyUFJqR52hCgQO/xy5XzrcrGTGEjgvJUfocKrzRIGgrbENhFEDnpg4Jf6iz+yROL3Lh6jijDh1inV+23RHDtqNHAujdkZC3MUpA5JsHBfs72KIij3bLegrNsJtN3z7FsqEDJP8rtNuaEXe9+VFQWaz3MpOjKgAUr/efbLycwyGwlMo1pCCv6Ni+27S8H25k2pRAyKdm7MK7I8ORuCsX1FvrTxsClTYWdEi/G5I3hTBZhU873NYj/4SkwPGeO+fpS7jiKIiDW7+ZffbGu+9O2t/ZvgRpvvf1NCcfz05Rgyxd3TfPbuvsdjFKlEL/wnpnOjiR6bX+77eOXZOx3clTYJ5RSVoc7IjjgrjNS0VxlpLxqSPFq0Olm3SgVMCAPqc2v0aI8+PTeqsMFYeU2HcVfSHbprIzA0IXhXlHZR/S9Ru/3DYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2906002)(508600001)(66556008)(53546011)(31686004)(316002)(186003)(6486002)(16576012)(26005)(66476007)(66946007)(6666004)(36756003)(956004)(2616005)(30864003)(8936002)(31696002)(8676002)(44832011)(38100700002)(86362001)(5660300002)(83380400001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c1g5Ulp4NlhqWExpeUp1dUtzczF6MklsR081Q001UTNXUEV4dEM3TktsTTNV?= =?utf-8?B?Rk1iQ3UvL29aWmZxQzdJTUIzMzBBelI0U25RWUNvUjc1dGEyZjdBdTNnNTZr?= =?utf-8?B?WVlPU3UvSmdFTzZrYlFIOXRhMHFyaVQrSGdJaTJLMldRTWVPNmM3VXQxUjNq?= =?utf-8?B?VllWODlUL1BKQUU0R2JQR1lEMjlyRUlTcndFcVhlT3lyZWZ2Z3pxWFg1R09H?= =?utf-8?B?N1pFbzh4OVJoYkQ4eDM4WEMvNVhvS2VvdkhodjdaNDZ6OHg5WjMzUFEranpw?= =?utf-8?B?Tmp4cDRDN3N5OEQ2OVRpRmtLVXJVSmd4c2t0L3hndSthVVB1ZlJoblJGTnNa?= =?utf-8?B?WUhBbmJQQWc3OUtia3hjV1JKTU4wWEVTd3NaUWhpbDlTOGZod0dJRXJScjNp?= =?utf-8?B?NE90aWRlVTJCeHM4cEZUYzMyVERNS0FlQUhJSXhTSjBlM2RlN1JOaHFHZC9p?= =?utf-8?B?THBFcWd0Vjg5SE90amE3WDNJUXhLbnhwaFc3TEdwVitOUmp2WGIwZjQ2U0pF?= =?utf-8?B?OVJkekVJbzJYZER6R2F2ZXJld1NNZzM4SzRQSnAyYkRicUpJYUpOV3hieDUz?= =?utf-8?B?SnVyUnRJdXRDdUtsQ3hRRHlncW55cVUxZlpvYVJQSHlaL3RwUlZUeXJXUVRr?= =?utf-8?B?OVhreFNsamk2eGRuNWQreTVTZzR6VThQZDdLMW1HVFp1NnNWVXNSSDRYa0tD?= =?utf-8?B?NTNYTlBNem85TG8rbzNmVHFWNmd5MU8yMDFLMCtWU0FVUmJiNFNPNkV4enNi?= =?utf-8?B?SmdJV3J6dXhhaXlYZnFSYTUybjNVVEpKN0xPTmh6Smxqcm8zcTcxOHdDeFpu?= =?utf-8?B?YXZsRmN1KzBxL0Vxd1JjdnVPemVhL3FYUFRxLzdaVHU2bTJLZ3doTWI2RFI2?= =?utf-8?B?NVc0NTRxYzBWMmtYekVkdkNaa2greGVTQXFaQjNMbGZ0RWdZbzRNcCt2L3dJ?= =?utf-8?B?V00razgwWGtKSlJTQ29iRkxVZXNmR0pNYU1rbmt4dy9GcXAreUk2b0pUZTkz?= =?utf-8?B?NWN3bi9sMkJOUmM1TWdTZUNPTklFV0pKcFF6cE0yYmVMeDMxcVVGZ1MwZFpu?= =?utf-8?B?MzkycFBqT0lUNkZVQTZGTVdQaTBGSjNLMmFQcUFUY2tkWXJtS3gvTzFyeFpa?= =?utf-8?B?bDJoSFQxMG5rSFRaNmp4RXF3WXRNQVJlcitCT3NsWlhUTjNkR0VBRkJ2OXlP?= =?utf-8?B?RFhpYmNNdWhQNngrNU5JMHZLNUgveXZTRDFHaWJ6TGt5L25GY2lzZzJVbU14?= =?utf-8?B?TEY0N1RoMy9rMlg5OVkzKzdaWm9MZXc4NkxSQmFIblZlOGJ0dE9BY0d4blZF?= =?utf-8?B?Q0JkTjIzS0dodzRra1dkb3ZNZjFCS2tBT0tXM0YzaG0rVVpPQmZuUzhOUmJO?= =?utf-8?B?cjlTdEpPQ2Nualg2QVJ3cFNvVEFVSFk1dXlVNzFEcHBRYWlLd2Rsb0RLakRS?= =?utf-8?B?Q29pR09hVVlIOXVaTnBJdlY3N2NMNFBDNzJBTVVpR3dKZnV6UUJSNDB3S0NZ?= =?utf-8?B?enFkWFhoY1NTRExxaW9OckwxZ2ErbFFFeUpyYysxaXErcXorVzdPWEdvUklQ?= =?utf-8?B?NFZLY0pWTitlcDFnc3BOdndiejVZOXl0UTI0U3JXV2ZiZjR4N3FSdnFHUzhQ?= =?utf-8?B?a1FUMnlOZjZicjNtQVJxU3BYSGxlZHdPT2hTNzIwWUYvYmtiSWE3bUlHYmVz?= =?utf-8?B?RjJCQ2FMUjFkYVBBKy91WGhsYjdLUktmU2tYTDVEdWRvZW9CSGE3bm9IU0g0?= =?utf-8?Q?WgfqXa+B6b/lV97i5uFdBsD1u+QvdjEWHUWg+YL?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6576a431-814e-4b04-d9b5-08d987bb6da0 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 04:48:52.0405 (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: IKcO0RoVkY5n7ARaeaAPnSdL/1Jy3aNfJvcevQt0JLVbjXYDqQWEN19I0PidWkDWw1Qq+iDzT6R6kAgfEb2D/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4980 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110050025 X-Proofpoint-ORIG-GUID: VJEwEeagvx8luWaRjrmWGOiW8W9Y5XJQ X-Proofpoint-GUID: VJEwEeagvx8luWaRjrmWGOiW8W9Y5XJQ Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 05/10/2021 01:19, Josef Bacik wrote: > We have a lot of device lookup functions that all do something slightly > different. > Clean this up by adding a struct to hold the different > lookup criteria, and then pass this around to btrfs_find_device() so it > can do the proper matching based on the lookup criteria. It is better now. > Signed-off-by: Josef Bacik Looks good. Reviewed-by: Anand Jain Thanks, Anand > --- > fs/btrfs/dev-replace.c | 18 +++---- > fs/btrfs/ioctl.c | 13 ++--- > fs/btrfs/scrub.c | 6 ++- > fs/btrfs/volumes.c | 120 +++++++++++++++++++++++++---------------- > fs/btrfs/volumes.h | 15 +++++- > 5 files changed, 108 insertions(+), 64 deletions(-) > > diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c > index d029be40ea6f..ff25da2dbd59 100644 > --- a/fs/btrfs/dev-replace.c > +++ b/fs/btrfs/dev-replace.c > @@ -70,6 +70,7 @@ static int btrfs_dev_replace_kthread(void *data); > > int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_key key; > struct btrfs_root *dev_root = fs_info->dev_root; > struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace; > @@ -84,6 +85,8 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) > if (!dev_root) > return 0; > > + args.devid = BTRFS_DEV_REPLACE_DEVID; > + > path = btrfs_alloc_path(); > if (!path) { > ret = -ENOMEM; > @@ -100,8 +103,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) > * We don't have a replace item or it's corrupted. If there is > * a replace target, fail the mount. > */ > - if (btrfs_find_device(fs_info->fs_devices, > - BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) { > + if (btrfs_find_device(fs_info->fs_devices, &args)) { > btrfs_err(fs_info, > "found replace target device without a valid replace item"); > ret = -EUCLEAN; > @@ -163,8 +165,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) > * We don't have an active replace item but if there is a > * replace target, fail the mount. > */ > - if (btrfs_find_device(fs_info->fs_devices, > - BTRFS_DEV_REPLACE_DEVID, NULL, NULL)) { > + if (btrfs_find_device(fs_info->fs_devices, &args)) { > btrfs_err(fs_info, > "replace devid present without an active replace item"); > ret = -EUCLEAN; > @@ -175,11 +176,10 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) > break; > case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: > case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED: > - dev_replace->srcdev = btrfs_find_device(fs_info->fs_devices, > - src_devid, NULL, NULL); > - dev_replace->tgtdev = btrfs_find_device(fs_info->fs_devices, > - BTRFS_DEV_REPLACE_DEVID, > - NULL, NULL); > + dev_replace->tgtdev = btrfs_find_device(fs_info->fs_devices, &args); > + args.devid = src_devid; > + dev_replace->srcdev = btrfs_find_device(fs_info->fs_devices, &args); > + > /* > * allow 'btrfs dev replace_cancel' if src/tgt device is > * missing > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 9eb0c1eb568e..b8508af4e539 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -1602,6 +1602,7 @@ static int exclop_start_or_cancel_reloc(struct btrfs_fs_info *fs_info, > static noinline int btrfs_ioctl_resize(struct file *file, > void __user *arg) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct inode *inode = file_inode(file); > struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); > u64 new_size; > @@ -1657,7 +1658,8 @@ static noinline int btrfs_ioctl_resize(struct file *file, > btrfs_info(fs_info, "resizing devid %llu", devid); > } > > - device = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL); > + args.devid = devid; > + device = btrfs_find_device(fs_info->fs_devices, &args); > if (!device) { > btrfs_info(fs_info, "resizer unable to find device %llu", > devid); > @@ -3317,22 +3319,21 @@ static long btrfs_ioctl_fs_info(struct btrfs_fs_info *fs_info, > static long btrfs_ioctl_dev_info(struct btrfs_fs_info *fs_info, > void __user *arg) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_ioctl_dev_info_args *di_args; > struct btrfs_device *dev; > int ret = 0; > - char *s_uuid = NULL; > > di_args = memdup_user(arg, sizeof(*di_args)); > if (IS_ERR(di_args)) > return PTR_ERR(di_args); > > + args.devid = di_args->devid; > if (!btrfs_is_empty_uuid(di_args->uuid)) > - s_uuid = di_args->uuid; > + args.uuid = di_args->uuid; > > rcu_read_lock(); > - dev = btrfs_find_device(fs_info->fs_devices, di_args->devid, s_uuid, > - NULL); > - > + dev = btrfs_find_device(fs_info->fs_devices, &args); > if (!dev) { > ret = -ENODEV; > goto out; > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index bd3cd7427391..1e29b9aa45df 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -4067,6 +4067,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > u64 end, struct btrfs_scrub_progress *progress, > int readonly, int is_dev_replace) > { > + struct btrfs_dev_lookup_args args = { .devid = devid }; > struct scrub_ctx *sctx; > int ret; > struct btrfs_device *dev; > @@ -4114,7 +4115,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > goto out_free_ctx; > > mutex_lock(&fs_info->fs_devices->device_list_mutex); > - dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL); > + dev = btrfs_find_device(fs_info->fs_devices, &args); > if (!dev || (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) && > !is_dev_replace)) { > mutex_unlock(&fs_info->fs_devices->device_list_mutex); > @@ -4287,11 +4288,12 @@ int btrfs_scrub_cancel_dev(struct btrfs_device *dev) > int btrfs_scrub_progress(struct btrfs_fs_info *fs_info, u64 devid, > struct btrfs_scrub_progress *progress) > { > + struct btrfs_dev_lookup_args args = { .devid = devid }; > struct btrfs_device *dev; > struct scrub_ctx *sctx = NULL; > > mutex_lock(&fs_info->fs_devices->device_list_mutex); > - dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL); > + dev = btrfs_find_device(fs_info->fs_devices, &args); > if (dev) > sctx = dev->scrub_ctx; > if (sctx) > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 5f19d0863094..191360e44a20 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -812,9 +812,13 @@ static noinline struct btrfs_device *device_list_add(const char *path, > > device = NULL; > } else { > + struct btrfs_dev_lookup_args args = { > + .devid = devid, > + .uuid = disk_super->dev_item.uuid, > + }; > + > mutex_lock(&fs_devices->device_list_mutex); > - device = btrfs_find_device(fs_devices, devid, > - disk_super->dev_item.uuid, NULL); > + device = btrfs_find_device(fs_devices, &args); > > /* > * If this disk has been pulled into an fs devices created by > @@ -2323,10 +2327,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev) > static struct btrfs_device *btrfs_find_device_by_path( > struct btrfs_fs_info *fs_info, const char *device_path) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > int ret = 0; > struct btrfs_super_block *disk_super; > - u64 devid; > - u8 *dev_uuid; > struct block_device *bdev; > struct btrfs_device *device; > > @@ -2335,14 +2338,14 @@ static struct btrfs_device *btrfs_find_device_by_path( > if (ret) > return ERR_PTR(ret); > > - devid = btrfs_stack_device_id(&disk_super->dev_item); > - dev_uuid = disk_super->dev_item.uuid; > + args.devid = btrfs_stack_device_id(&disk_super->dev_item); > + args.uuid = disk_super->dev_item.uuid; > if (btrfs_fs_incompat(fs_info, METADATA_UUID)) > - device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, > - disk_super->metadata_uuid); > + args.fsid = disk_super->metadata_uuid; > else > - device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, > - disk_super->fsid); > + args.fsid = disk_super->fsid; > + > + device = btrfs_find_device(fs_info->fs_devices, &args); > > btrfs_release_disk_super(disk_super); > if (!device) > @@ -2358,11 +2361,12 @@ struct btrfs_device *btrfs_find_device_by_devspec( > struct btrfs_fs_info *fs_info, u64 devid, > const char *device_path) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_device *device; > > if (devid) { > - device = btrfs_find_device(fs_info->fs_devices, devid, NULL, > - NULL); > + args.devid = devid; > + device = btrfs_find_device(fs_info->fs_devices, &args); > if (!device) > return ERR_PTR(-ENOENT); > return device; > @@ -2372,14 +2376,11 @@ struct btrfs_device *btrfs_find_device_by_devspec( > return ERR_PTR(-EINVAL); > > if (strcmp(device_path, "missing") == 0) { > - /* Find first missing device */ > - list_for_each_entry(device, &fs_info->fs_devices->devices, > - dev_list) { > - if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, > - &device->dev_state) && !device->bdev) > - return device; > - } > - return ERR_PTR(-ENOENT); > + args.missing = true; > + device = btrfs_find_device(fs_info->fs_devices, &args); > + if (!device) > + return ERR_PTR(-ENOENT); > + return device; > } > > return btrfs_find_device_by_path(fs_info, device_path); > @@ -2459,6 +2460,7 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) > */ > static int btrfs_finish_sprout(struct btrfs_trans_handle *trans) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_fs_info *fs_info = trans->fs_info; > struct btrfs_root *root = fs_info->chunk_root; > struct btrfs_path *path; > @@ -2468,7 +2470,6 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans) > struct btrfs_key key; > u8 fs_uuid[BTRFS_FSID_SIZE]; > u8 dev_uuid[BTRFS_UUID_SIZE]; > - u64 devid; > int ret; > > path = btrfs_alloc_path(); > @@ -2505,13 +2506,14 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans) > > dev_item = btrfs_item_ptr(leaf, path->slots[0], > struct btrfs_dev_item); > - devid = btrfs_device_id(leaf, dev_item); > + args.devid = btrfs_device_id(leaf, dev_item); > read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item), > BTRFS_UUID_SIZE); > read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item), > BTRFS_FSID_SIZE); > - device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, > - fs_uuid); > + args.uuid = dev_uuid; > + args.fsid = fs_uuid; > + device = btrfs_find_device(fs_info->fs_devices, &args); > BUG_ON(!device); /* Logic error */ > > if (device->fs_devices->seeding) { > @@ -6753,6 +6755,32 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, > return BLK_STS_OK; > } > > +static inline bool dev_args_match_fs_devices(struct btrfs_dev_lookup_args *args, > + struct btrfs_fs_devices *fs_devices) > +{ > + if (args->fsid == NULL) > + return true; > + if (!memcmp(fs_devices->metadata_uuid, args->fsid, BTRFS_FSID_SIZE)) > + return true; > + return false; > +} > + > +static inline bool dev_args_match_device(struct btrfs_dev_lookup_args *args, > + struct btrfs_device *device) > +{ > + ASSERT((args->devid != (u64)-1) || args->missing); > + if ((args->devid != (u64)-1) && device->devid != args->devid) > + return false; > + if (args->uuid && memcmp(device->uuid, args->uuid, BTRFS_UUID_SIZE)) > + return false; > + if (!args->missing) > + return true; > + if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state) && > + !device->bdev) > + return true; > + return false; > +} > + > /* > * Find a device specified by @devid or @uuid in the list of @fs_devices, or > * return NULL. > @@ -6761,30 +6789,24 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, > * only devid is used. > */ > struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices, > - u64 devid, u8 *uuid, u8 *fsid) > + struct btrfs_dev_lookup_args *args) > { > struct btrfs_device *device; > struct btrfs_fs_devices *seed_devs; > > - if (!fsid || !memcmp(fs_devices->metadata_uuid, fsid, BTRFS_FSID_SIZE)) { > + if (dev_args_match_fs_devices(args, fs_devices)) { > list_for_each_entry(device, &fs_devices->devices, dev_list) { > - if (device->devid == devid && > - (!uuid || memcmp(device->uuid, uuid, > - BTRFS_UUID_SIZE) == 0)) > + if (dev_args_match_device(args, device)) > return device; > } > } > > list_for_each_entry(seed_devs, &fs_devices->seed_list, seed_list) { > - if (!fsid || > - !memcmp(seed_devs->metadata_uuid, fsid, BTRFS_FSID_SIZE)) { > - list_for_each_entry(device, &seed_devs->devices, > - dev_list) { > - if (device->devid == devid && > - (!uuid || memcmp(device->uuid, uuid, > - BTRFS_UUID_SIZE) == 0)) > - return device; > - } > + if (!dev_args_match_fs_devices(args, seed_devs)) > + continue; > + list_for_each_entry(device, &seed_devs->devices, dev_list) { > + if (dev_args_match_device(args, device)) > + return device; > } > } > > @@ -6950,6 +6972,7 @@ static void warn_32bit_meta_chunk(struct btrfs_fs_info *fs_info, > static int read_one_chunk(struct btrfs_key *key, struct extent_buffer *leaf, > struct btrfs_chunk *chunk) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_fs_info *fs_info = leaf->fs_info; > struct extent_map_tree *map_tree = &fs_info->mapping_tree; > struct map_lookup *map; > @@ -7026,12 +7049,12 @@ static int read_one_chunk(struct btrfs_key *key, struct extent_buffer *leaf, > for (i = 0; i < num_stripes; i++) { > map->stripes[i].physical = > btrfs_stripe_offset_nr(leaf, chunk, i); > - devid = btrfs_stripe_devid_nr(leaf, chunk, i); > + args.devid = btrfs_stripe_devid_nr(leaf, chunk, i); > read_extent_buffer(leaf, uuid, (unsigned long) > btrfs_stripe_dev_uuid_nr(chunk, i), > BTRFS_UUID_SIZE); > - map->stripes[i].dev = btrfs_find_device(fs_info->fs_devices, > - devid, uuid, NULL); > + args.uuid = uuid; > + map->stripes[i].dev = btrfs_find_device(fs_info->fs_devices, &args); > if (!map->stripes[i].dev && > !btrfs_test_opt(fs_info, DEGRADED)) { > free_extent_map(em); > @@ -7149,6 +7172,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info, > static int read_one_dev(struct extent_buffer *leaf, > struct btrfs_dev_item *dev_item) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_fs_info *fs_info = leaf->fs_info; > struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; > struct btrfs_device *device; > @@ -7157,11 +7181,13 @@ static int read_one_dev(struct extent_buffer *leaf, > u8 fs_uuid[BTRFS_FSID_SIZE]; > u8 dev_uuid[BTRFS_UUID_SIZE]; > > - devid = btrfs_device_id(leaf, dev_item); > + args.devid = btrfs_device_id(leaf, dev_item); > read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item), > BTRFS_UUID_SIZE); > read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item), > BTRFS_FSID_SIZE); > + args.uuid = dev_uuid; > + args.fsid = fs_uuid; > > if (memcmp(fs_uuid, fs_devices->metadata_uuid, BTRFS_FSID_SIZE)) { > fs_devices = open_seed_devices(fs_info, fs_uuid); > @@ -7169,8 +7195,7 @@ static int read_one_dev(struct extent_buffer *leaf, > return PTR_ERR(fs_devices); > } > > - device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, > - fs_uuid); > + device = btrfs_find_device(fs_info->fs_devices, &args); > if (!device) { > if (!btrfs_test_opt(fs_info, DEGRADED)) { > btrfs_report_missing_device(fs_info, devid, > @@ -7839,12 +7864,14 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *dev) > int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info, > struct btrfs_ioctl_get_dev_stats *stats) > { > + BTRFS_DEV_LOOKUP_ARGS(args); > struct btrfs_device *dev; > struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; > int i; > > mutex_lock(&fs_devices->device_list_mutex); > - dev = btrfs_find_device(fs_info->fs_devices, stats->devid, NULL, NULL); > + args.devid = stats->devid; > + dev = btrfs_find_device(fs_info->fs_devices, &args); > mutex_unlock(&fs_devices->device_list_mutex); > > if (!dev) { > @@ -7920,6 +7947,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info, > u64 chunk_offset, u64 devid, > u64 physical_offset, u64 physical_len) > { > + struct btrfs_dev_lookup_args args = { .devid = devid }; > struct extent_map_tree *em_tree = &fs_info->mapping_tree; > struct extent_map *em; > struct map_lookup *map; > @@ -7975,7 +8003,7 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info, > } > > /* Make sure no dev extent is beyond device boundary */ > - dev = btrfs_find_device(fs_info->fs_devices, devid, NULL, NULL); > + dev = btrfs_find_device(fs_info->fs_devices, &args); > if (!dev) { > btrfs_err(fs_info, "failed to find devid %llu", devid); > ret = -EUCLEAN; > diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h > index c7ac43d8a7e8..fa9a56c37d45 100644 > --- a/fs/btrfs/volumes.h > +++ b/fs/btrfs/volumes.h > @@ -452,6 +452,19 @@ struct btrfs_balance_control { > struct btrfs_balance_progress stat; > }; > > +struct btrfs_dev_lookup_args { > + u64 devid; > + u8 *uuid; > + u8 *fsid; > + bool missing; > +}; > + > +/* We have to init to -1 because BTRFS_DEV_REPLACE_DEVID is 0 */ > +#define BTRFS_DEV_LOOKUP_ARGS_INIT { .devid = (u64)-1 } > + > +#define BTRFS_DEV_LOOKUP_ARGS(name) \ > + struct btrfs_dev_lookup_args name = BTRFS_DEV_LOOKUP_ARGS_INIT > + > enum btrfs_map_op { > BTRFS_MAP_READ, > BTRFS_MAP_WRITE, > @@ -517,7 +530,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len); > int btrfs_grow_device(struct btrfs_trans_handle *trans, > struct btrfs_device *device, u64 new_size); > struct btrfs_device *btrfs_find_device(struct btrfs_fs_devices *fs_devices, > - u64 devid, u8 *uuid, u8 *fsid); > + struct btrfs_dev_lookup_args *args); > int btrfs_shrink_device(struct btrfs_device *device, u64 new_size); > int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *path); > int btrfs_balance(struct btrfs_fs_info *fs_info, >