From patchwork Thu Dec 16 12:56:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12681105 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AA6FC433EF for ; Thu, 16 Dec 2021 12:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237122AbhLPM6y (ORCPT ); Thu, 16 Dec 2021 07:58:54 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:23498 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237049AbhLPM5G (ORCPT ); Thu, 16 Dec 2021 07:57:06 -0500 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCFmDr007980; Thu, 16 Dec 2021 12:57:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=7P1zOUWejRpKWGMzps/xmDJu3V6UD4OS3VRWhStecjA=; b=E5bxKiOzn0Fq9rSBc7+rIpulrJ0WMPC1YVhYgu+Pc89i/XUI/ndjU5i916aThSsWezzh sNkgF/95mZaGTPTFwjbvxAw0FJEz1YkZUEIJM1O9HM8h/aIqYBXzCujcztIEU/AxWPSl 5r6K/kyP0vJ6W8quh+iGbCC0+WMQihaL0cixXLswZM5ByXQoocRgmb0ELi7oh0TXahNM fwR362o7Pzq60L3r3f0ndh52bjwnFWN0Fu/HYkvrOmLWbrPQOXpY/TFfw4ZGTys5Txhw Cbckgj35yhGoFZcO3Wsam683zw8yYNB60DgnTZUm+++jaN4c009SNNkCXQo2Xt4gjMUy Ng== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3cyknc2ndg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:04 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCoBms133932; Thu, 16 Dec 2021 12:57:03 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam08lp2042.outbound.protection.outlook.com [104.47.73.42]) by aserp3030.oracle.com with ESMTP id 3cyju9u7b2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VoQueXYFwh6NQOiJavckDhQl7tp7CdAKDLNnyr+cGTeC5FOgA9JRvs5ikq1M2R7Ah0IIx2ytoyFFkIJBEiuVWaA7ULVlcbsy05H6iNda7mWFU1ZDSqW532/gsvED+SC9IeAxIKn3gRidCCknGixwqX/VT38+PuBLt31IA0yhwdSvvkgLbi1Yd4mks/i90+ebzyST3jfikBHCLgAcwF6nXpCBJ2s/Y4WjQdMjThEYWt+RRYIf0qwHFPCxPCc9w3Se1ULXNDC9Ln/RN7ZKE8+8vRD6XzFqRjLBAz2SmFLrE67R5bF6a6pwIOLlPvSc0UgS7d+LalY02PRaeFs2thDvSw== 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=7P1zOUWejRpKWGMzps/xmDJu3V6UD4OS3VRWhStecjA=; b=mGodrKgOqKEQl5IYTOtmxT6kyL5Wv+d76dyFYpqARCvWADXUk6S5bsC6MuXKA7HhQwO4Pl5sVAvq7CKyC3gQ4kAmrv4/ey1Rh/CLKmnYQBpM1cN80nKO/q0AYtfwC0eIdHNX5Zt6ePFc+Hq7T/dgeMngbifcRCmaPN1qQVxS1HXek4fN9o6J1IqfQhZ6PS/W24zTQW/xXteZhPAMfGpLIp2LZ//u7kv0LMI7UCFFc8S3kaAW+3YcZEr8Ayfk3RtZpiyEjaTA47fEfbgytp39LKCuqSMPuxvjEBHo3BhoT/aUs0ygszCHqE7xv7LxuE632v2mHObQSgHD14PqL7ultg== 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=7P1zOUWejRpKWGMzps/xmDJu3V6UD4OS3VRWhStecjA=; b=i1xY25cfdUonZbx5NM+p08uQqCNddqBLZHpog0+2ycbVBW0Cm27ZhbhdXr5Du6F2rcZX4N16k7FG8kZ/WHsMRkZy7N6vmbjDEDfVIc2OQ8muc3Fg54+mRjkBykvzg0iRYf8ThoqinsLKlv4ZfSME62lQGwIOhd9PD0v4MVhtsVA= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BL0PR10MB3425.namprd10.prod.outlook.com (2603:10b6:208:33::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Thu, 16 Dec 2021 12:57:01 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00%8]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 12:57:01 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH stable-5.15.y 1/4] btrfs: convert latest_bdev type to btrfs_device and rename Date: Thu, 16 Dec 2021 20:56:44 +0800 Message-Id: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: X-ClientProxiedBy: SI2PR06CA0010.apcprd06.prod.outlook.com (2603:1096:4:186::6) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7995a738-9dae-4688-190f-08d9c0938d62 X-MS-TrafficTypeDiagnostic: BL0PR10MB3425:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:644; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SfNUoBLiC0CTf5Gs09wah/100M6BUKwxTIfzg80rB+hBZUVY747XOMkEp0KD0HKFrtXBJMCe2AGUZp40++jG2GqCQ7NLpPjA0Hk8eyXKKlQwCtQpIqHtcGs5K6X8RYhVZp3gNFcB8zPiFyZhgHTXgEnSd389HT/7BPnap6xXN0dNCLVYAxQ6Jt9elFDWFOgcQHg1L5LbtSofpoZxv+PWNbivO6pYS/uV3NjIpGknw0BZooF1cO8+x/EZc/vOjAXXwdrg3lBnOoXFOap50M34DEa0MyqZgwfi/+k3QyU4agUHTxMqSr8sGRZ7soAkZuZupRZ9BW2GJdMLjntMOPcZI+GT282ZoQ26UwUoyDLiHZBDB1yJMv9KbMK/MZ8DxI+1iHf5AoiEX+RZCIzJLxc8irKsPixvNia4Ga6jJQZ4RJk99USAe35BOnC/QGfSOraYW+Ztzw56ehpr9jjh/0pyVVm2IvAZlLVvR2BE08Wf05acsqLTsMw6fzChqL/yQzuLwMpDdnsxMjTdw6eUuzhpYe3afRmwgWjYuBjmQetzbpIqxEXsGUuvTHvTVy6tPxGhhzm4kTBIEvH8aRm9tHFIZ9yshJfllDgd4VgbMkTBYEBswJkhM8zbMOg9SypPH1o5Z4cBQUzIKI66AFPLVFR6yQ== 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)(66946007)(66556008)(316002)(5660300002)(186003)(6916009)(6486002)(6666004)(66476007)(508600001)(4326008)(6506007)(86362001)(36756003)(6512007)(2906002)(2616005)(8936002)(83380400001)(38100700002)(44832011)(8676002)(450100002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 353haDn+uNw3oHdNrkkL3K9f+ciIyS4fuE+j4gPFFs8XwgTX1FJAeAiCWfeppbC2jrQL9nL23/TW4hO2h+pODZKz1RyXHm24AzgP7S87CM2FGAQikuHVkAsUZkHL3k/uqj1r4c8dHVIePkOmVBJ2HEE0Eq73eRhNlFGEiWzf6JsMKe8fO7Avwn4pxud86gbM6qmGt+qouUma4WBKYRS0blOyOk6QCeDsRySZgSkUKKhfts7fLnLLG3cDj0zuxHnDozsml9XKSaPehK3md2G/kOINMybtm/NQyy1vcOnVeJ/qF4z2KVZS6vyuEGr/6aCqZ6mms9p9Ix7VL2gb4zAe5XcvhoQP1MpKlFXBo6Hf/v5mPr7o/MCSX8wy6dwT3o+HQ3pv9fASLbzbo1Dh1q99N2VsVeF3hZakGARzxoNZ1JAXkojF+4o2ZwGq0fhHwX8Ie//IYc4CHNTpXLYbWtuSWG7j58N5Q/MUHZrEnr700bC4nooZJwEqqN8tixNo+i/7RNM2Ke/e2IDCeQPhjP6aBQnzQRWPEHlaBgFJ+sRHbyE5bS/pTEQgZ/i+kZosfIGekPVOcQM0f1w4ye8NgflPQiKfxXwA7CCYym1kAIxI5lgGWJIuqvPy6vhWHrvLdZ123ubbs/BY/Sj5QajoA+2krql6m3tFC3ls+hjE/WREl5G5N9SYrp25yQd+3LIQtaQoArrDuOKZKd8miRJGz0JXAnref0W/0Q+6ADCiNq+S7hS377MXX/5Y9kJJWOgRXZ8rCFZmPumAfJaCg582SFHXnin2dfRZ69EUeOtpkEhqPwFEIOcKwvK76gnVUReCQfaWIRIMsyxUxupLg9ATnSlnk9Fa32sih+q9en4kjgcTBAsQyQrJgOUZyBUZj4qhG76poJs5RJrFepvC0/Cta+DZSRlp42MBWz8N0OPY9FnWztQUUMEQinNeV5HiZ9yCBl/BaLbORAprV4drCRhHoOMoTaaWZon2PLLnVEE3j4506knQveHNUpWmecB92vMvwAYa7DSW2inizzhUyw+w4whavMbOmFJH4Hm6pQeTOC4jfMOcQH931Yqb1m3RVFrFeg0qu+fS36m6Bm3FGQ5HEhfFZC0r/wFR/2c1HrrXrlN6YsPftl3e2IDk6ZNbfNskBdudeTtZdDxH617DU6GgyYvzHPGIzvjvhGQ4u6dYLATycht5CHr1bZD/oMOsqVTgP1u3qtA6SooDT4ckf/pZ0/8N/3pcLIj5DbgLO5DaDg8cUZr29ETaDjSl4xqfShQBJPk05MCLfqXl8JsvTL8ai+mgdEVc/rw5+eKHhCgeOQ42ZUiT/mUTsX2KEDWmwheRN6h/hma77AHyNj+DpE5/x0c5oVM5p8gOY6NG23SSwwzt6GN6cIjfJbDkGV2Ax4E27KSRbvkVaGEOVbn242jZlIw2GRmo59OumqWkKX4J4sWu4EOVmBe/jt6c4ewyQjkXqZLQITFx+208amos2Kc9NjrMB3pO3ecgkDOHEPz9J8Y3zu3XdzElb4Ri0d+7r/sRLK1Xc6/5CYknhC1hqj9mxI2VAg834hJVh75hVzCVQFDYAYj73koBnHdEphgqXjQTntCbEK6qgD/4o8Z+JGcnHLqDDwDtJmf727hD1lIPSamsH4j90NLNzUpp1T2WafuJ9uWYTkbgZPLTwV37lh7Bi5j87Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7995a738-9dae-4688-190f-08d9c0938d62 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 12:57:01.5471 (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: rrNeBH3FLNOjSeusfNn4Oq7DtL8eg8IjxuTjjqKJ7YPZ4Q+qTjPcqkjYyfO20MD+ebF2Ws7+EeRQosYNH7rS0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR10MB3425 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10199 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160072 X-Proofpoint-ORIG-GUID: -oyjhwP0pAuUDvK27rcl2RDJWhH2b1wU X-Proofpoint-GUID: -oyjhwP0pAuUDvK27rcl2RDJWhH2b1wU Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Commit d24fa5c1da08026be9959baca309fa0adf8708bf upstream. In preparation to fix a bug in btrfs_show_devname(). Convert fs_devices::latest_bdev type from struct block_device to struct btrfs_device and, rename the member to fs_devices::latest_dev. So that btrfs_show_devname() can use fs_devices::latest_dev::name. Tested-by: Su Yue Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain --- fs/btrfs/disk-io.c | 6 +++--- fs/btrfs/extent_io.c | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/super.c | 2 +- fs/btrfs/volumes.c | 10 +++++----- fs/btrfs/volumes.h | 6 +++++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e00c4c1f622f..244cddf050d1 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3229,12 +3229,12 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device mapping_set_gfp_mask(fs_info->btree_inode->i_mapping, GFP_NOFS); btrfs_init_btree_inode(fs_info); - invalidate_bdev(fs_devices->latest_bdev); + invalidate_bdev(fs_devices->latest_dev->bdev); /* * Read super block and check the signature bytes only */ - disk_super = btrfs_read_dev_super(fs_devices->latest_bdev); + disk_super = btrfs_read_dev_super(fs_devices->latest_dev->bdev); if (IS_ERR(disk_super)) { err = PTR_ERR(disk_super); goto fail_alloc; @@ -3466,7 +3466,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device * below in btrfs_init_dev_replace(). */ btrfs_free_extra_devids(fs_devices); - if (!fs_devices->latest_bdev) { + if (!fs_devices->latest_dev->bdev) { btrfs_err(fs_info, "failed to read devices"); goto fail_tree_roots; } diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index a40fb9c74dda..3c7ee83e9199 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3327,7 +3327,7 @@ static int alloc_new_bio(struct btrfs_inode *inode, if (wbc) { struct block_device *bdev; - bdev = fs_info->fs_devices->latest_bdev; + bdev = fs_info->fs_devices->latest_dev->bdev; bio_set_dev(bio, bdev); wbc_init_bio(wbc, bio); } diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 61b4651f008d..4af74b62e7d9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7967,7 +7967,7 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, iomap->type = IOMAP_MAPPED; } iomap->offset = start; - iomap->bdev = fs_info->fs_devices->latest_bdev; + iomap->bdev = fs_info->fs_devices->latest_dev->bdev; iomap->length = len; if (write && btrfs_use_zone_append(BTRFS_I(inode), em->block_start)) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 537d90bf5d84..e4963da4dd08 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1705,7 +1705,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, goto error_close_devices; } - bdev = fs_devices->latest_bdev; + bdev = fs_devices->latest_dev->bdev; s = sget(fs_type, btrfs_test_super, btrfs_set_super, flags | SB_NOSEC, fs_info); if (IS_ERR(s)) { diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index bc2e4683e856..4afa050384d9 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1092,7 +1092,7 @@ void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices) list_for_each_entry(seed_dev, &fs_devices->seed_list, seed_list) __btrfs_free_extra_devids(seed_dev, &latest_dev); - fs_devices->latest_bdev = latest_dev->bdev; + fs_devices->latest_dev = latest_dev; mutex_unlock(&uuid_mutex); } @@ -1225,7 +1225,7 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices, return -EINVAL; fs_devices->opened = 1; - fs_devices->latest_bdev = latest_dev->bdev; + fs_devices->latest_dev = latest_dev; fs_devices->total_rw_bytes = 0; fs_devices->chunk_alloc_policy = BTRFS_CHUNK_ALLOC_REGULAR; fs_devices->read_policy = BTRFS_READ_POLICY_PID; @@ -1993,7 +1993,7 @@ static struct btrfs_device * btrfs_find_next_active_device( } /* - * Helper function to check if the given device is part of s_bdev / latest_bdev + * Helper function to check if the given device is part of s_bdev / latest_dev * and replace it with the provided or the next active device, in the context * where this function called, there should be always be another device (or * this_dev) which is active. @@ -2012,8 +2012,8 @@ void __cold btrfs_assign_next_active_device(struct btrfs_device *device, (fs_info->sb->s_bdev == device->bdev)) fs_info->sb->s_bdev = next_device->bdev; - if (fs_info->fs_devices->latest_bdev == device->bdev) - fs_info->fs_devices->latest_bdev = next_device->bdev; + if (fs_info->fs_devices->latest_dev->bdev == device->bdev) + fs_info->fs_devices->latest_dev = next_device; } /* diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 2183361db614..4db10d071d67 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -246,7 +246,11 @@ struct btrfs_fs_devices { /* Highest generation number of seen devices */ u64 latest_generation; - struct block_device *latest_bdev; + /* + * The mount device or a device with highest generation after removal + * or replace. + */ + struct btrfs_device *latest_dev; /* all of the devices in the FS, protected by a mutex * so we can safely walk it to write out the supers without From patchwork Thu Dec 16 12:56:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12681099 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C009C4321E for ; Thu, 16 Dec 2021 12:57:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237043AbhLPM5P (ORCPT ); Thu, 16 Dec 2021 07:57:15 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:4566 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237121AbhLPM5N (ORCPT ); Thu, 16 Dec 2021 07:57:13 -0500 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 1BGCLAbL012513; Thu, 16 Dec 2021 12:57:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=AwoV8nyp2Rwk3kdTuofVtNRbjXvbX9U6fgRTeECtr9g=; b=yJz/NKHyXpFVs8y8Z8HA5GgfLH0gYWZKFP2HWh5caMnlcdFLwO9mFR8S35YcWxehiAQy PDX3e/IEYYOs+hcyHxLIghY+/DO0Dyn/QokDaP7F5fM2zgTj7np1gIY2yO9x4LWZthyG yDLtqAqNzebc00ep1Qg7SaDeha2fhE0Z3EyACidFKTjrSDTRpi2xHzlzL9K4lAaKmrfi F2ByX8yaxmlnFr+IP683e8sjxnJ46cbfqn4apfzVuERRjVlx2ttB/Ogj2TbsFuO5duQc q+58fk2rAqkkrkEYNFuy9nwY7r9Q/Z/ohul0s2BvgtzK6+2NW+vNreUtSC5n18OMF4uv PQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3cyknp2ne7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:12 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCoanf031481; Thu, 16 Dec 2021 12:57:12 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam08lp2048.outbound.protection.outlook.com [104.47.73.48]) by aserp3020.oracle.com with ESMTP id 3cxmrdb9jc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QSCwc/Ml3JyacjGCSgqlI1O2cXX7qE3wuvoxMoCX8/xTpGV28IRZtgI1s7/TCi8w5xgE/6XLZcsyR+qRF4hQNH9C+bhBw08ZI9xVvqlhi/x0phma+Hp+Wv8sPpjL/F7E5Aj0Yh1oH1biUfTJpQB2U3wk9xTRfg0oFwa377YirEuBXpcM6I4vmX5IlJgqSdwJGL6IUO7ZFdGE+HRaqRWj8z4ym7JjU8MmExREYvlIMVp4E96ao1lpIKwVz0ECxRJMSbuctpDUXTxLRR6h6UWnlkT1TFhfIm/L/sPSuzd+DbShjqK+Yi2HG17Z+m7h6WS+2KJ3KCpOxhWqhq1ZEyTb2w== 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=AwoV8nyp2Rwk3kdTuofVtNRbjXvbX9U6fgRTeECtr9g=; b=getK5XUbcdYdVDMcc32DzMhnJ2fVj7yRixnKDjLSn6z4ltfdlh2MLwxjHbEtMFj2OGk3G/vPtIzlJUoPtrV9y8XH6r1FIyEfUJI4T9ui/LeUgbIP0MLogdnAXViv98JRuvQ7LkDrDyOuhsGye0q5hZQ2EghtBwjbMilhHgS1XXLuxrHDnKMA8GxIDZFmUcIyZLD71b08l1EjqKC7fO3df6HnOlobXPwPGWNo52flBq140W8ZD2HmcxZZpytCkfaV8IlCjoYDd00IY7KWarisQDrOXndIneeY+4IWY3KpyQI+ctH1d/KKrAfqF9fmetsIPXr+L9E97EoBnrsn/g/dtw== 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=AwoV8nyp2Rwk3kdTuofVtNRbjXvbX9U6fgRTeECtr9g=; b=D3LCbTwWln7AyCRBin5+g03amPvC9BAx6o1Bd7P+w0sXSdqMbgnEW24nnmEnWoTqk+rJLWDrJOmljzhfyh0zB44HE0+6yKeUlb3+e3DSBZ6iUWozzsW/8QF5lq3IJ5S/8HxZhc2NZDFAFsev8ZacHfbaHQjO1vQtH8MeBqxNLTo= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BL0PR10MB3425.namprd10.prod.outlook.com (2603:10b6:208:33::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Thu, 16 Dec 2021 12:57:10 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00%8]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 12:57:10 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH stable-5.15.y 2/4] btrfs: use latest_dev in btrfs_show_devname Date: Thu, 16 Dec 2021 20:56:45 +0800 Message-Id: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: X-ClientProxiedBy: SI2PR06CA0016.apcprd06.prod.outlook.com (2603:1096:4:186::22) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b795967a-ba5f-4ff9-011e-08d9c0939295 X-MS-TrafficTypeDiagnostic: BL0PR10MB3425:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sZLl/sBOYKKzoOfKrYD0DYugTy/g9Qa0Ay3O8j13xpv6UCxmDZt8XPSWNstzfyrsB3gvnldZQSX75dBZh6PstULHhXG7LKuNrpO/thw9zMeYOSpQPlLybfGqq+GJNAsQKWz2gufXeOvXVWH+YvBu6kcfEXaMo/6rxka5JcimAX44XYgEQ5pMHxQmYvNVXXtK2WExp/HHA7vaNmE5NOCQLq6WR6/GLuxi0ZVq/BFLf30pQMZEGit8Ieof+9rB+rpyRiDmvOUXIgauHTGYrUB6gR1QOHYIDv4jfYWRkJZFhCKqHdG1Wlm7F+ujdwQoOKd7g3U3PssF4lmZhZhAheoYZ++0wxku21b0BEbpxD6xGSxM1DS3MGG15PuG/QJEzcE5U2kMMOLgHaB0ldVtVAzQv5mw3suuoJQTyZfSQ8ttYj+B2eDYe6kYmB4EjTPOyH8mvh2rZROEWnFBlCsiQz0hEGshxHDUiwtlJWD8KDC6JyBXHrM+LdjmwLfG6BU8WGWU3o3/qoM5cnPK/zPSMlwMRJfKICoIB+aKLJgwyDkOxEK8D49PNT+izEutY6GmPPiZkTcUsdw1u+O0pGA3I09k/zX/8CYq/OOgWylkIi4588HYLq/BIDEhEFeZcqqeOUTRLAw7rp9GJ8Pr8WuYKJ870g== 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)(66946007)(66556008)(316002)(5660300002)(186003)(6916009)(6486002)(6666004)(66476007)(508600001)(4326008)(6506007)(86362001)(36756003)(6512007)(2906002)(2616005)(8936002)(83380400001)(38100700002)(44832011)(8676002)(450100002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IPtqmxJ+XrdgO4kTDlpQvKQSNoXmDNu+zLAMA2d9mq9GSI2t/GyGJFvmOqEMKOnOtNY9ClUr2Wkt2Zvexi93JxaDpvipAK0MXAQiYRo0wPN6FNfJ9gQYJXxqukuGUr5H+ncKuBLtPfIsHCxi9X7XVAd4G0vrvl2eEt6YbImMmHQKSbpI2cA5erihcmwAbqvmkREL8p4RadaX07QI3VEciU9x+6Dbfz0ID/H4+CpZ7jEu2q0bmyaXwKNhzIJwYYPLbRqtLiqvEbEDrrlWWXNAvUSooxgqyGdf5lktEbx4MHjRC70rGrG9Drt8fiH2gdVYnpD+ZSw7LzAkaGaZyPnj6oCHLdJSh6smsi2DwoQOjPbqReNv/mbIffz4bqqL0EqjYgWjleqnJrQ41tmhvrshjJchkCd0Iz3giNkrm9qJHgL3NYa0Q3fUCVv8NbBJ09aOk51n4HG5xQ6ePmGch642bzoITuFs5RzqFbUBpXJQjo3D4zFss9JdGLdG+Op7ZHkThQjY3yGVQR78AbOOCBvMQIUoyTa3OqQarPwg3uSoAZbnPOzMiWyvkSUmQA6y6Pibmpj99/MGs6v767sAHxkjavh9htxMO8NoAXnggDaUCvXiuClPKh/Y9Yhbw1RfNFd9jWVATrwynQe8KUUM2PAz+3LdIAGKwgR8LctcTWgGohq40hQ6pt/eepNuHxIXbEfEtKxTtgXxbiyIpoaRylyvuZHLPx+vJhN2VS1et719c9cAjqUuJl5nUbC75+DI4fjcjIC19Xy7yNHfcwID/Oz3E5GuisUk+w8Z2oCkSnFw7VN4XRFcL9j1YPFhWCSkZXqWLx39b8FhqEDDFkWUXONzFJU2n99ySoPDzrSze/NspL4xyuNvQc0xeA6NQPIo6051IU0sk7hJgdq+jTAtfK3qS7xMKZVVEcQlMFqvG1jqHMd8Y9et4RC3A/nEVsGYWZUmqjMgCtVu0F40v1gF2H+p5hhvEzR54guRKZcuNaP2aoa3fnyo7ptn3W33CEKmhHMX2/gTGCzyR9HhhrvVBz+2Pk3XaTQv7PkeYbDoiTXXiNiuos9Kc7AA+qRczdMbXJ1NkIdV/vOtMptulbyWawKidTl0Eh9ElP3rpHlCdK8JENWNJy8X1OQxciUwVGzJes94MPrD+YekVk6hznLi/MvYR8IZd+sc5zJGHM4omD9Pe3sUVW1MVIPp+jrD/cbI8oE0FSKCjU5wm6KiumlIR+tYvnBYIMQiAqR0nsl2Z+xNKyB/O5H3DcvXGxyErEo1fk19O6FLkkOcbXGa5Xtm5eKVwhx5D4OSq55iTO6C87XBY29fwSvRouMLJIOD2OA8VXMF+2L9OLEYNuLLdsYMuC7/xcsjAaZl14cg+xvL2SvsGa+3CDfLNwsxdfoEVbNO1Nv3UUYrFNBp4qLK489+IKGqXY7CIXHP7RXXE6yaR8WScnZ7CY9knV8siIMJcFGt8wGShnDWXIWc5ECzetnMyKDK7MInbUxHIdBIzP3kxAwPp83vamexcv5MkJ4rqQ5m6sx3o2RYI8+JRMfhVwAvBEVnrIp1hkEoDIQk4fIq/ARqJ5HLEp3E3EGbDmJsLy9kzIEOERg5iZhBgQlK3THAbggG2awrlchOeL5RHawm32uN55RY3hMeSeI9K6Qe6zzTa6EmNu7pfjuZENBF9RsbCFVEag== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b795967a-ba5f-4ff9-011e-08d9c0939295 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 12:57:10.2693 (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: moxuwvAzkePjSLtQfKdvvnE55MhIoKF3CSxUdxNDAEpXwVo4xRbEBJSG80BcIo4UC4fKCadbIfiy/owoM0twxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR10MB3425 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10199 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160072 X-Proofpoint-ORIG-GUID: vBDO5RFBgWg-bk3AWWqAZTzE8cbob2TI X-Proofpoint-GUID: vBDO5RFBgWg-bk3AWWqAZTzE8cbob2TI Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Commit 6605fd2f394bba0a0059df2b6cfc87b0b6d393a2 upstream. The test case btrfs/238 reports the warning below: WARNING: CPU: 3 PID: 481 at fs/btrfs/super.c:2509 btrfs_show_devname+0x104/0x1e8 [btrfs] CPU: 2 PID: 1 Comm: systemd Tainted: G W O 5.14.0-rc1-custom #72 Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 Call trace: btrfs_show_devname+0x108/0x1b4 [btrfs] show_mountinfo+0x234/0x2c4 m_show+0x28/0x34 seq_read_iter+0x12c/0x3c4 vfs_read+0x29c/0x2c8 ksys_read+0x80/0xec __arm64_sys_read+0x28/0x34 invoke_syscall+0x50/0xf8 do_el0_svc+0x88/0x138 el0_svc+0x2c/0x8c el0t_64_sync_handler+0x84/0xe4 el0t_64_sync+0x198/0x19c Reason: While btrfs_prepare_sprout() moves the fs_devices::devices into fs_devices::seed_list, the btrfs_show_devname() searches for the devices and found none, leading to the warning as in above. Fix: latest_dev is updated according to the changes to the device list. That means we could use the latest_dev->name to show the device name in /proc/self/mounts, the pointer will be always valid as it's assigned before the device is deleted from the list in remove or replace. The RCU protection is sufficient as the device structure is freed after synchronization. Reported-by: Su Yue Tested-by: Su Yue Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain --- fs/btrfs/super.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index e4963da4dd08..7f91d62c2225 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2463,30 +2463,16 @@ static int btrfs_unfreeze(struct super_block *sb) static int btrfs_show_devname(struct seq_file *m, struct dentry *root) { struct btrfs_fs_info *fs_info = btrfs_sb(root->d_sb); - struct btrfs_device *dev, *first_dev = NULL; /* - * Lightweight locking of the devices. We should not need - * device_list_mutex here as we only read the device data and the list - * is protected by RCU. Even if a device is deleted during the list - * traversals, we'll get valid data, the freeing callback will wait at - * least until the rcu_read_unlock. + * There should be always a valid pointer in latest_dev, it may be stale + * for a short moment in case it's being deleted but still valid until + * the end of RCU grace period. */ rcu_read_lock(); - list_for_each_entry_rcu(dev, &fs_info->fs_devices->devices, dev_list) { - if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state)) - continue; - if (!dev->name) - continue; - if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev; - } - - if (first_dev) - seq_escape(m, rcu_str_deref(first_dev->name), " \t\n\\"); - else - WARN_ON(1); + seq_escape(m, rcu_str_deref(fs_info->fs_devices->latest_dev->name), " \t\n\\"); rcu_read_unlock(); + return 0; } From patchwork Thu Dec 16 12:56:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12681101 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5F8CC433F5 for ; Thu, 16 Dec 2021 12:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237042AbhLPM5V (ORCPT ); Thu, 16 Dec 2021 07:57:21 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:17472 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237069AbhLPM5U (ORCPT ); Thu, 16 Dec 2021 07:57:20 -0500 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCX5CA000422; Thu, 16 Dec 2021 12:57:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=jEsEFEw9l1np6ispEoGgySgHzt2k/1uN/MjwzB5lHnw=; b=poc39XBirCzdU2v9NyD3hU6iTODPtWvXYfbhPK5/V7eXwdDqggf6jwGT/JdfcrobxNyq X+GFxllfrTQSUe0EC6CZR9SbwZSZHPPsCDDRhm8ZMd/as5Sks8EkqpYpkykLGb4bJhyW cUJVIsDFwhC03ZMDdzTLuhz6vrL4H5surqqx52+NiBFiywLMziUSZD8NXjqiM2MPWxhK gpV0ewg3pa94WsEdwAZykqpsUgXBlOyG58ArWPMHpdxVHJUrCL1NDCsRVYqu40hUKNC7 M63acdBfIrgWSVYVyqykKA5HgrZ1Ys76TOAB33iWnGOgrte/ZSVAU5L3+SRDncdMAMIp FQ== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3cyknrjm1r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:20 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCoB3G133884; Thu, 16 Dec 2021 12:57:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3030.oracle.com with ESMTP id 3cyju9u7hs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRbLcbrPJW9/mxWbmYT22ae3h4RCYgRrJtKouv5xpmlWm+OUKorgrbHp16hfJ9U4/IbhFjA56lokxzGaY8cnoyTsqZ9itOnoJzLxv2iP7O1hkrRf/HNduqINVaRcgCvQllbuoTfpDBdgeAtWEr9WL1BpAW+L5eCiOWWKLoEwR8hOURLbP4O2xLeJ7vFUmhICCHC5EOeiG9+bnve7NAS0j4lcvvMQc42Q7W2IpnmKcDrbmCAatY8rN2NjodgO5xRlYUp0uF+WjJVgrwquf6mtSZrRLQo3DHkAZa/vrInPaE4Tl1KmmMBHHEK8sQqI5U8r2Ln5aQ6BQb0AZfQx/aNFSA== 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=jEsEFEw9l1np6ispEoGgySgHzt2k/1uN/MjwzB5lHnw=; b=i6Y9W5ug45l/jrdMvZxYQsg6bhDe6/n7l0TRyOA2taj/JQt+v7tepKKiZbVykuMYK3cp1zakH9JUvhwZlGKrxDdIDKoFxKNYpe/fdzekFlidU9QoXMmaF22Z5wTkatdiwYzztVy6MvpP10vcAqVJ2IXANF5oGjUAvgs27QR1ALx07uomjI7v44TC27G9pCJ6oyTIMotUWRsonfzSyAk/AvprsC3thoJTb82+8AFs1opQhU7FhE4guqBHOZbdC+6PBp5JY7YgsjJC8x2UVkcZkGGgkEeTNpsYTR8GuXisVQDKCNswGJkwuV78fdSqSgvo5VexpgO1bsg8HKE2K8zKaw== 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=jEsEFEw9l1np6ispEoGgySgHzt2k/1uN/MjwzB5lHnw=; b=wRoRF10tr3Vd3Z3d+ebYRZtS+Ffj4Pmsm7oW0aj7E5WvJarKGoSr7uFnadLU/AnYif1hYuLFHwf5jFjMB4cKCIODRkhNkqnyMutitt3+bGpcIn8GG0jLyhZuXHwFGrX81Ikr2gkfKkZ6lor89S0uLV51hhHP2xlqWNk/xM+AQXA= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BL0PR10MB3425.namprd10.prod.outlook.com (2603:10b6:208:33::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Thu, 16 Dec 2021 12:57:17 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00%8]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 12:57:17 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH stable-5.15.y 3/4] btrfs: update latest_dev when we create a sprout device Date: Thu, 16 Dec 2021 20:56:46 +0800 Message-Id: <3cc9f5d26cf29f91b3a87df814ff84420e31080a.1639658429.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: X-ClientProxiedBy: SI2P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::6) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56ca2ae7-4f32-4353-28b8-08d9c09396f1 X-MS-TrafficTypeDiagnostic: BL0PR10MB3425:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tVXQ1JxIyZOdP/zUPOpx6Iwmplw7MtzP16Iz81IdMaKPb3wN/+9Vwxua5F48j0LJOG6OpqgA55npDOC/9Q4gtoiNw0SJLsXg+lpsjH8DuIwXPBTJyrtoVQGFEoBYMMfmVbXuUerUFBrDY9Vj6FHCrF6ppET5T+JcPSwzl24Wi16owroI/C5xzH4qAGnwG6dpLoMJ9toilTrVssBjywvSBsIzYCuq1mbcGLgSkYglwpq3fb4oJGI8t92Pj27aN4PAybLGVdNgbHWxVGr5C1C1d2F3noer7rjZbNPJTM0uAAzW3hXtrBfF/iQyzZZhfYDiT2/Qlx9/Zp2yh/+HyhpwRMoJXS42ik9vULgrdYiuQrhxiPKO8gHD2g2JGIkLkQlSW9JBEsLkSheITe2ClzrhT64t6nQwFbapZCdF1dyHYAaG8PfMxX/lFQt9Ts9/JKjf0kxQ0O75RYPpyWHRwDpBtyOxcAqRf0Al0i+JrI66tq+Eb8C1fH5NpmMo1GjEFEbldwhRTrNTqXsRwDmW+8ubFcAcYZY1KkPwAOZbU6VsQpU7rdhqbozghACuT3g0s6tFlq6kbkVV2dHd5I2sLb3k+Iky6XRdO37xV31+DMB0DMqCLMH65lj2A6v1jehvRGQGM8lVQGNuSOliA/SecWvF9w== 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)(66946007)(66556008)(316002)(5660300002)(186003)(6916009)(6486002)(6666004)(66476007)(508600001)(4326008)(6506007)(86362001)(15650500001)(36756003)(6512007)(2906002)(2616005)(8936002)(83380400001)(38100700002)(44832011)(8676002)(450100002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4X2q43muviR8tF9HGeJczXTvtedBlrP4cvgQxhxOxjpkMCbs45YDly2qbNE4i5lzcK8B8QcnEXHro9TiHzKpRxBUdHTbtiuchWdQ1x2tIWSLJ7syRFfgl43BK08XxClXFNVR+N+2/cUCyEo2+LHCQf3W7LGTAzH0Ltynkcn1TOJaCGnT6WVYJfSRW/hf7fEkM/UNbG8V2QE+tkV7LceqK0XHNGSpewUJeY0R2LYp9Wj1bn5BgV6yrCfPVXUnVK12UD/WqU+iJhYJmOhAokvEF9VIW8Z95+yHcSf+O78xgQlp4wWWY9DdfpIa6SaxcaLRc+r1XbPTyLmGAtER87JACnRFEq2RXikucMyfcuJEvk5o9R9bS9VRJ9cyM0sPstxzHNPDBKRy5yQGmeYKSWS0ZgI8YUUaEWcha9dHyiIopd9GQiJj3k3NFjM6XvJt8+lTCBsMxKxGrmTLjmL0527nQrOGN0xZMMPlC69snA1lw9R465v6l7EaL3beqBpkuEcRV29bc5LQP4ZzGNQG4UvLoRHWDrO9Zm2t/god2SUwr8t4eDB5KKQY6VrYShxOT/23OrK8vZO31WI52pVSevUZlnVa3SQv3FN73LW8qYEIVlOIg7xnM2ZxetODPZaZneJujBQ3xa+iA+UsHmwJnt1+XQLZA37eKGCo9PQp2y+WYxNvrjW4t6PuuP08ZtrrtBAWXzPLVDgV0Hyra953lGyJtPthJ0yFhnbiOsblICGXgJ26l328xGX0uYlfGBpqVq93Z71UOJH4K4pmF0gi6YaDlcqgdcMhf6VG3YpocVcPZYIZ8Do4ZBoz2vKTy/WsbCKSXmQqBKAqweFqEYssoKfQCazMvap32O2Wjt+INv35XrtYcI1e8ayOI7ZgM+0WSwCPBuO3v/Hs106+LZyC9F4KlfY4n2RY6UVD+hfyAmQNUFVSyJ6jy2hsEYJed82q1ZT4/x/Su0YneGqxc8rNq6G9yOgjFHgnQAfQBMAG/5HiZGg52g5VUJffJiLL660PQnFtX/O0cUDQNVV8acZghCFi3Sjsmuf39SerPf+r9lzbI6ad1Ywx1Ejt3kYb7DvfMy1szzixwNmx1pLbaMEObIioJmct059jbofjtyXJ0hi47awufffMDvSVpZW6eBryNzB1BzjYkdebEOWXhKFRU+//sv2/+6vRY0qvik+mSVkb4kS+qwhJrLNk8wdF7ohGidZzo+UZLfJl3Z/dgvQjaYWSiNHgThhe78I1eyH3fzomkSYhf0uhWRAY2dvnbiID9YBs8fRoAHQ36xNWWCy6JGdvjp5lZEbzQlVpR/GAy5FnukeqsDkI1T61ATG3Uykxpf0ChnPm7WPgiDNKLCJqAkKCL32Ov5d7pkQdrw3BSHQ/XV5rnODaa4v+qe1E+91oKpxW5WtSOjnBuexO+rleWZTXt7Iw1EuiE/PPiYA+rqYgMQqUWlar8UihoPi232fmp238Rr7ZH26qF/gEr8cVSRMd3xKjMmaJJRIB7Xxh5ILKh2dZcwUPp1WUlc4mirJ7uYdaVl4Y6mgI+SVsCFNTEsz6Ld0hOnyQd2ziroNhyptkUFvd/87iIs1Y9GXMAqoWouBL20ZVSoge8PySJUBGCwCWeSX746zaSCkZy1iPcPakRPiJ4M8VXlZ0xCzhFM3d74HU6P5tV5ECvzFNTZG4Ls7WIA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56ca2ae7-4f32-4353-28b8-08d9c09396f1 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 12:57:17.5998 (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: KLQdtAHyqckGmBw0Werwtih9pPi4mhES0d8jWbNXbhOrx6V1HYl+FYE6xrPvQ3mTy2FHj81wEWcicgCwcCWnVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR10MB3425 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10199 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160072 X-Proofpoint-ORIG-GUID: CKHSXtUa3evU8qNGZjOf63qiXJQjJZ4z X-Proofpoint-GUID: CKHSXtUa3evU8qNGZjOf63qiXJQjJZ4z Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Commit b7cb29e666fe79dda5dbe5f57fb7c92413bf161c upstream. When we add a device to the seed filesystem (sprouting) it is a new filesystem (and fsid) on the device added. Update the latest_dev so that /proc/self/mounts shows the correct device. Example: $ btrfstune -S1 /dev/vg/seed $ mount /dev/vg/seed /btrfs mount: /btrfs: WARNING: device write-protected, mounted read-only. $ cat /proc/self/mounts | grep btrfs /dev/mapper/vg-seed /btrfs btrfs ro,relatime,space_cache,subvolid=5,subvol=/ 0 0 $ btrfs dev add -f /dev/vg/new /btrfs Before: $ cat /proc/self/mounts | grep btrfs /dev/mapper/vg-seed /btrfs btrfs ro,relatime,space_cache,subvolid=5,subvol=/ 0 0 After: $ cat /proc/self/mounts | grep btrfs /dev/mapper/vg-new /btrfs btrfs ro,relatime,space_cache,subvolid=5,subvol=/ 0 0 Tested-by: Su Yue Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain --- fs/btrfs/volumes.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 4afa050384d9..b996ea0dc78b 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2634,6 +2634,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path btrfs_abort_transaction(trans, ret); goto error_trans; } + btrfs_assign_next_active_device(fs_info->fs_devices->latest_dev, + device); } device->fs_devices = fs_devices; From patchwork Thu Dec 16 12:56:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12681103 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 293B1C433FE for ; Thu, 16 Dec 2021 12:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237074AbhLPM52 (ORCPT ); Thu, 16 Dec 2021 07:57:28 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:30270 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237069AbhLPM52 (ORCPT ); Thu, 16 Dec 2021 07:57:28 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1BGCOktk004235; Thu, 16 Dec 2021 12:57:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=zC65l+39CBCp+dw1xl4cUd5wrd9eoBwoj1+w3rfTY2w=; b=WT1+XFd0gxvs7oN572hkBXfFf4YHuEFW9ggBKakECzkhEvsXgZ81Ux7SzNVXYI36M625 Ivh3XVM4lSi0iV6sn3UMJQD+OA7A2/DKuap/i5KMq0mOp5UtbZbsX0vMnOWMwi7MSPZu WZeTt2di8xDiFahl7BKB2WLVEm0wqZ00ipqY01UZldq4hURJQKYxobfPZWYL2cv5t7+k POPirvYGbkAXThAzBAO44ntPa+mYYUAL4MDAfd2TGvb3HcaUrcwAuh1onjO/WUZvrv96 FXpsqOx3x5p2ffbA0JGmDPnbqAk/hysSBTcwA1pU+cf4kfhooVzkWDGGS6IQL4Bb6MKo 3A== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3cykm5aq4d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:27 +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 1BGCpqBN081746; Thu, 16 Dec 2021 12:57:26 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by userp3020.oracle.com with ESMTP id 3cvnetm772-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Dec 2021 12:57:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=glxJjdKYi6iXev92MITjBgvIIgUD++/lcHIsP6dWwBi1yTF5Fs3Q6KoF5p3MInvPwOU5NyIIW6+dQOng19HS39FnyH0o9B3NuEzE63r3wKueUpi/PBnGXCGiWIgxLJfN+sJtNOx8446OGzlOqJw1Xsmslzs14O4RH/cdf+Xa0CN92lTQ2YmcdxSDPw1psEdjv9nY8cdGLKtWPaT9aX2XmfUs4y4z/UWLlbKIsQ/N8Eceav8SzaNJ98NWAv/xV9g21O2wQ4+Xh9pZ9BhiusUh+utanc2ioUyO5nq/hKj5GcJAb2qqPvrViFSiZlz5mn3axiSs3o15kBUCRYVxZZQJXw== 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=zC65l+39CBCp+dw1xl4cUd5wrd9eoBwoj1+w3rfTY2w=; b=K03fh1k1htyaFPtyggfYmYbsVm1hietrujrW9lYeg9LwH98B0JywUTMY/ggFEbY/b+IW542o0iybMG74yForvWflu5Mj6wSoRZnnmjaypLria/0B1GF2QOxxeMS6dmTJqbq67kqAf+TVcrcpS6ItvdsGkU2DrtZ+I3n5Rb8ebtJk/mJ0uEke522PS+B7JtVKrvLVYJVBtwcYMa55yPweYLPNsWhdv64H/gME0jo5g5h1nsEevNPpS/mY67HTHoI0Dd4cXgYSD3MkfWGJmig0nV6J+6TsotGEn0hs8edvoTr9yBgHy9wxuch5mBppo++cH/eBUx30nVu/nsl1Ei7NAA== 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=zC65l+39CBCp+dw1xl4cUd5wrd9eoBwoj1+w3rfTY2w=; b=BW1RTiCqevBlUsRrvPwwgdE2v6Ansp/OQnmWknS3rIYuLaAt3ZU7OjX4/BupE2U/iRDBZXitDL3ijBUX/f+oLjL509Y16omx7I6EgUAodSkVhs7b2or6j7Mu4hnbsKJtarbEmOcxBRAVlpJRh6MDdXEbr2mtSjnkczewgQ+jGRk= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BLAPR10MB4851.namprd10.prod.outlook.com (2603:10b6:208:332::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Thu, 16 Dec 2021 12:57:24 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::f450:87d2:4d68:5e00%8]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 12:57:24 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH stable-5.15.y 4/4] btrfs: remove stale comment about the btrfs_show_devname Date: Thu, 16 Dec 2021 20:56:47 +0800 Message-Id: <2fe0e10df7494300346f88470230a883f20753c4.1639658429.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: X-ClientProxiedBy: TYAPR03CA0021.apcprd03.prod.outlook.com (2603:1096:404:14::33) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 505cb29c-285c-4b11-ebef-08d9c0939b2b X-MS-TrafficTypeDiagnostic: BLAPR10MB4851:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:514; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MD5kVjmG74N4Jb3Rg/ZGfnGIpsnD6v5DB8Q0mnQd9V8e6lzpwk2bsEL5h/mS8BcKOfnB7sqwiB8J++yz1Byi6mKvGgTgSZymxsrHXftaWV5LqdrUPORMzFyDDdpDYv45x63kYb0WTd/bAbzPINu513qYo5gmxum09t0nPEjO/0I6RPI1uC9r9unL0lRgklgRH10bU8NxHnF8VuNSkzyO+SginzYyNBrKQhHvz5xUTrG6frDBOEXb5tFmPiUjU6yuRxbK+pSPSoAun7nnILbPEo6vMy2KgZXMX4vRRYw77Ey0SHBbiyTf7qelHwERF5Iv92lwlz1GOW6QbQDOI+Bes0FymKXx8y+nevIpIzmpX1lylISohYXm9P3Rtcjd20njZXcA8EqD/D+JM2Me3mk3MGy42C79HUF8X+KRPx6vqN10fWjmPElyImRFmh9Pq+ihgLi0QLuD5by/UECJR3zgUqIVLo9a0IwTr9stlpbRVio7Yam5ytKCt+L+hqwmHEwMldoNv0hflaOe9BKfQsgaAOvJ/Ks4UYrAidyUhVeX9GbO50BMxD07g6o1h9z3ieTou568MaFfZRJAez3kM7Jyucz8vzu7EYPYps4kNwDahr0XOSgdbCJ8z+gJkfw743gW/L2grvDYMGKn9tIQmSJrhQ== 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)(6916009)(450100002)(44832011)(66946007)(6486002)(36756003)(66556008)(5660300002)(38100700002)(8936002)(6666004)(6512007)(2906002)(86362001)(8676002)(4326008)(66476007)(6506007)(83380400001)(316002)(508600001)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gjzbs0xeDzORcrBBTP88Pq6m1YuAciI8d8+88QbzevdXApNtH5QDVj2Flg3yFpCYktsd0f/K/t9fd95NfT1+9kcMSXqIvUr3y5KG3rDihFuChnFrT320iK0SWapotyBAj4twOt8waTKG/jdAiEOmFUtbopJhalutSFdJVD+xDknkteMgGB03urY8bBDck0f8rAdNxChopYg2IN5kYSkWfqnehAbZYFgEfaO89Udud3R2JvZZiYTfRkVh67JURq5SrA7nCBOxKIAJBBvfurG2TPMaKUj9j5WrbPSGYBaFkAgmBcxBLY6l92RSGrSWkw3dt34QRPsxUoctXmvhP7ODpbliy5O7btIc3Rg+oE1tTjX95FcRt0XgFi5BHA/ZFmDBRPD4S/xuO8qRicGB1iMNrXNhEPgOpPga2KsY/eneGH8sfktoIRhHJAp7wH4gBW6V1zNWYp95hp+o7TemzoBPiYyeVCz0e0BbkVvkPw/whhTh7Fbjgmde7iAOIJo5/il/5IrJZSDLiiQk+ILx0+firgmK49VK8e5tbX5YhdJBpwIOCmHobpW4+nmI0cGoqUEFgRix/PUt6BXKaHgY4f6l6H3o8UfgPUR2Q1Deb7ICc3B3/xsSN3UcHUIXd4q6krcu14V9VEW8g3AkDrte+QFINgHxctC7ZZLZVpJVQg34JCJ4I1fd47ZMYall5ck3K9HUphhlsTfVcihQ372d6Vu0/Qw983dsXhkIX0mWSZYzamv0vTCoXoYGlWG0RfDD2UF3S8xeSL5RJhDJYoldTmACh7z5fe7MNQF+ui1ifoMMx7rFiVL+ZuBXgqcYCQCgu/apu/6vagX3tB8NPSSax+grimvYQrKWX1mHccquiCWiYTYocVNFOzE1NAQc/P2d1/+IjfNXue6dTlCSK9QGa1nCbplIlwi347eZ4lgGgKBI3qkOYHpFGMCxRcFpJ774CKduB2jhtpSX3qppljnGpNoNgzIS1yylPFEd8uaMnGdMIILyeULc+35ZIxZ97DJkx+jphMu9ms04chhMKp0ejKMe1+krUKhEOLhSa2FjOeG8NqOL+D4GOUiXeDn4b+6pxT3fIOU3t4TrJwzG9bFKa2+XnkilbMj0txg1QjFvD/+0SDqXTps/nl5LmUlN1KsUktRdslNpVwlC4IaKvcxv2b+9prFixYR2Hesqi0qfXn0PbnwgvgtLUi6LzZ2R2BrJ3pKWOAtSW9MHLUoDcA4ajQwCUhzMVN/HiGLhFKdMBWDnrN9ts+w/FOxpMhyR8Yn2g6qLyKBJHEyt3Im6Oip6K/VDieF53StF4CkXQtk6eHmcjw+IjSPoBpKU7inn1yrQPNPYvGkwJ2VItMZO+O+NmK5qrdfb1oNzUZiMHwcsuDTj78OGhA0+wa6FF29kBj9arEO27X4Uhnposh20t5JcEL3hw82w7K+Su9YOJ16lDeQjdthuVzgKgv0dIeCtn/e/d7VmDNYNmy7Px2vtGzLwy7BVgi9MHUMqfCnG90Y0aTfduPkXuTWQ2Ab7Ilw0bQ3yByyNRadfBvhQ1tYgitUZ5RC9kNteOONU0Q6aTKQ4rB5ZY1hu13hjKfmGwKp57fcLHu8Y98GK8JYr/VIWShc2c0TBMGnKwvJAlzf8dGbejLRiTLXKNxI9i8gx0qWW9hQOwygITjcU0L1ayBt9F6+oC/S/sg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 505cb29c-285c-4b11-ebef-08d9c0939b2b X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 12:57:24.6958 (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: 039Ktl2rK6VzwbpNRmfZgv5/uQ+t9Ec70Yt2FEdFK3aJjTMmeezqFlIB3o3LPMjq71iAtR17XowP3wBApNtqzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4851 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10199 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160072 X-Proofpoint-GUID: au_t6tcb_1eactmaIEewRwj2t8AU-CzD X-Proofpoint-ORIG-GUID: au_t6tcb_1eactmaIEewRwj2t8AU-CzD Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Commit cdccc03a8a369b59cff5e7ea3292511cfa551120 upstream. There were few lockdep warnings because btrfs_show_devname() was using device_list_mutex as recorded in the commits: 0ccd05285e7f ("btrfs: fix a possible umount deadlock") 779bf3fefa83 ("btrfs: fix lock dep warning, move scratch dev out of device_list_mutex and uuid_mutex") And finally, commit 88c14590cdd6 ("btrfs: use RCU in btrfs_show_devname for device list traversal") removed the device_list_mutex from btrfs_show_devname for performance reasons. This patch removes a stale comment about the function btrfs_show_devname and device_list_mutex. Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain --- fs/btrfs/volumes.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b996ea0dc78b..0f549d2681c0 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2312,13 +2312,6 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev) mutex_unlock(&fs_devices->device_list_mutex); - /* - * The update_dev_time() with in btrfs_scratch_superblocks() - * may lead to a call to btrfs_show_devname() which will try - * to hold device_list_mutex. And here this device - * is already out of device list, so we don't have to hold - * the device_list_mutex lock. - */ btrfs_scratch_superblocks(tgtdev->fs_info, tgtdev->bdev, tgtdev->name->str);