From mboxrd@z Thu Jan 1 00:00:00 1970 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 8FE6EC433EF for ; Mon, 22 Nov 2021 14:02:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239680AbhKVOFt (ORCPT ); Mon, 22 Nov 2021 09:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239697AbhKVOFs (ORCPT ); Mon, 22 Nov 2021 09:05:48 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 794A9C061748 for ; Mon, 22 Nov 2021 06:02:41 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id l22so80965677lfg.7 for ; Mon, 22 Nov 2021 06:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JytnxT7bnzQFXLy/RoZJgh+ovqHN3rLtvCOsBRhYDns=; b=hQkGTd1mjQRfH9+CVQqiWVV48iAWRlhMwVFE3mj+V78fO4Oyw2uWy38TScr40O58tZ ADPDrXK2B7c0Q3HMmEWtTOPms8Q8SDrdAx5ISm2sgVIeK1tN7QNcETJ1WBcvWjzyTZUE kWqiL+ndhJfxx7pezulRW8gagoVPZ7tn96rFyjYYC1zVNV0vL2CqW9YOS3QCpq2TLGjs I1cwMd+arU2ec0P6TNfiM5Ss4Kg10/RX03lcURpD2i6g67+InA/vAqz+0xaEuBG7atYd 2P+2nWc+MY4s4727laKzmSj/O+LW04SUA3VddbhSa3oJCwoC5AUqes9lp1P4ZCNqrOYG eYXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JytnxT7bnzQFXLy/RoZJgh+ovqHN3rLtvCOsBRhYDns=; b=n8M9DRtZ/N4DqN8885IMZJ5AbC2o/r/acuKGkohkRkXfhoUJvmDN0JiJOu5nR5sse6 YWBjySQwvz4uffJibS7nulEBW1ypobtDnToTjqXFKIU/toJB2D7RB/ldo6bQU4lDsyIT gAJP5xeZnyyoX6nD/n1ZxZtjIgHwVaYA6aj7nq8ybznh0AWM6CjunNj8AqsXGjUDgngj jYESl6fFuYOUhvTzK0qCkyrU8W7+O88S2v1TYKmrH+QHI0k6zO5kuof/qyxs+CRUk278 9Tpmrjfs3kDrsbyfudXD+b/NoPIqWmYFTGjbjrLYInrBmVwk56iGkb3nAj9ZjIa3DmMP pB3A== X-Gm-Message-State: AOAM532IRUaeRhZ53Ci4GcsiRiRAWJTNtYcgFH6z0Vu1SGmoSugp4nyr 9vHsKf4h7EaH5GuV083v+SIYQd8SGLMmLQfl/tXDItNJwCc= X-Google-Smtp-Source: ABdhPJyP0WWPOUuxe9M6tQSWw5jZTCz4UtaLJQOS0HZzYxAFuZagzyGVXN36LGLWdzorUm4WoaeGbrJp8TvLl95B3Cs= X-Received: by 2002:a05:651c:1507:: with SMTP id e7mr39868643ljf.300.1637589757669; Mon, 22 Nov 2021 06:02:37 -0800 (PST) MIME-Version: 1.0 References: <20211122130625.1136848-1-hch@lst.de> <20211122130625.1136848-7-hch@lst.de> In-Reply-To: <20211122130625.1136848-7-hch@lst.de> From: Ulf Hansson Date: Mon, 22 Nov 2021 15:02:01 +0100 Message-ID: Subject: Re: [PATCH 06/14] block: rename GENHD_FL_NO_PART_SCAN to GENHD_FL_NO_PART To: Christoph Hellwig Cc: Jens Axboe , linux-block@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org On Mon, 22 Nov 2021 at 14:06, Christoph Hellwig wrote: > > The GENHD_FL_NO_PART_SCAN controls more than just partitions canning, > so rename it to GENHD_FL_NO_PART. > > Signed-off-by: Christoph Hellwig Acked-by: Ulf Hansson Kind regards Uffe > --- > block/genhd.c | 2 +- > drivers/block/loop.c | 8 ++++---- > drivers/block/n64cart.c | 2 +- > drivers/mmc/core/block.c | 4 ++-- > include/linux/genhd.h | 13 ++++++------- > 5 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 0cf3d30429e14..b37925ed1d7e9 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -500,7 +500,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, > * and don't bother scanning for partitions either. > */ > disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; > - disk->flags |= GENHD_FL_NO_PART_SCAN; > + disk->flags |= GENHD_FL_NO_PART; > } else { > ret = bdi_register(disk->bdi, "%u:%u", > disk->major, disk->first_minor); > diff --git a/drivers/block/loop.c b/drivers/block/loop.c > index a154cab6cd989..7219d98c6fb8a 100644 > --- a/drivers/block/loop.c > +++ b/drivers/block/loop.c > @@ -1061,7 +1061,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, > lo->lo_flags |= LO_FLAGS_PARTSCAN; > partscan = lo->lo_flags & LO_FLAGS_PARTSCAN; > if (partscan) > - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; > > loop_global_unlock(lo, is_loop); > if (partscan) > @@ -1191,7 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) > mutex_lock(&lo->lo_mutex); > lo->lo_flags = 0; > if (!part_shift) > - lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags |= GENHD_FL_NO_PART; > lo->lo_state = Lo_unbound; > mutex_unlock(&lo->lo_mutex); > > @@ -1301,7 +1301,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) > > if (!err && (lo->lo_flags & LO_FLAGS_PARTSCAN) && > !(prev_lo_flags & LO_FLAGS_PARTSCAN)) { > - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; > partscan = true; > } > out_unlock: > @@ -2032,7 +2032,7 @@ static int loop_add(int i) > * userspace tools. Parameters like this in general should be avoided. > */ > if (!part_shift) > - disk->flags |= GENHD_FL_NO_PART_SCAN; > + disk->flags |= GENHD_FL_NO_PART; > disk->flags |= GENHD_FL_EXT_DEVT; > atomic_set(&lo->lo_refcnt, 0); > mutex_init(&lo->lo_mutex); > diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c > index 78282f01f5813..4db9a8c244af5 100644 > --- a/drivers/block/n64cart.c > +++ b/drivers/block/n64cart.c > @@ -136,7 +136,7 @@ static int __init n64cart_probe(struct platform_device *pdev) > goto out; > > disk->first_minor = 0; > - disk->flags = GENHD_FL_NO_PART_SCAN; > + disk->flags = GENHD_FL_NO_PART; > disk->fops = &n64cart_fops; > disk->private_data = &pdev->dev; > strcpy(disk->disk_name, "n64cart"); > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 90e1bcd03b46c..a71b3512c877a 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -2397,8 +2397,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, > set_disk_ro(md->disk, md->read_only || default_ro); > md->disk->flags = GENHD_FL_EXT_DEVT; > if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT)) > - md->disk->flags |= GENHD_FL_NO_PART_SCAN > - | GENHD_FL_SUPPRESS_PARTITION_INFO; > + md->disk->flags |= GENHD_FL_NO_PART | > + GENHD_FL_SUPPRESS_PARTITION_INFO; > > /* > * As discussed on lkml, GENHD_FL_REMOVABLE should: > diff --git a/include/linux/genhd.h b/include/linux/genhd.h > index 74518c576fbb9..0b9be3df94898 100644 > --- a/include/linux/genhd.h > +++ b/include/linux/genhd.h > @@ -56,15 +56,15 @@ struct partition_meta_info { > * (``BLOCK_EXT_MAJOR``). > * This affects the maximum number of partitions. > * > - * ``GENHD_FL_NO_PART_SCAN`` (0x0200): partition scanning is disabled. > - * Used for loop devices in their default settings and some MMC > - * devices. > + * ``GENHD_FL_NO_PART`` (0x0200): partition support is disabled. > + * The kernel will not scan for partitions from add_disk, and users > + * can't add partitions manually. > * > * ``GENHD_FL_HIDDEN`` (0x0400): the block device is hidden; it > * doesn't produce events, doesn't appear in sysfs, and doesn't have > * an associated ``bdev``. > * Implies ``GENHD_FL_SUPPRESS_PARTITION_INFO`` and > - * ``GENHD_FL_NO_PART_SCAN``. > + * ``GENHD_FL_NO_PART``. > * Used for multipath devices. > */ > #define GENHD_FL_REMOVABLE 0x0001 > @@ -72,7 +72,7 @@ struct partition_meta_info { > /* 4 is unused (used to be GENHD_FL_MEDIA_CHANGE_NOTIFY) */ > #define GENHD_FL_SUPPRESS_PARTITION_INFO 0x0020 > #define GENHD_FL_EXT_DEVT 0x0040 > -#define GENHD_FL_NO_PART_SCAN 0x0200 > +#define GENHD_FL_NO_PART 0x0200 > #define GENHD_FL_HIDDEN 0x0400 > > enum { > @@ -180,8 +180,7 @@ static inline int disk_max_parts(struct gendisk *disk) > > static inline bool disk_part_scan_enabled(struct gendisk *disk) > { > - return disk_max_parts(disk) > 1 && > - !(disk->flags & GENHD_FL_NO_PART_SCAN); > + return disk_max_parts(disk) > 1 && !(disk->flags & GENHD_FL_NO_PART); > } > > static inline dev_t disk_devt(struct gendisk *disk) > -- > 2.30.2 >