From: Jan Kara <jack@suse.cz> To: Christian Brauner <brauner@kernel.org> Cc: <linux-fsdevel@vger.kernel.org>, <linux-block@vger.kernel.org>, Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>, Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org>, dm-devel@redhat.com, Christoph Hellwig <hch@lst.de> Subject: [PATCH 10/29] dm: Convert to bdev_open_by_dev() Date: Wed, 27 Sep 2023 11:34:16 +0200 [thread overview] Message-ID: <20230927093442.25915-10-jack@suse.cz> (raw) In-Reply-To: <20230818123232.2269-1-jack@suse.cz> Convert device mapper to use bdev_open_by_dev() and pass the handle around. CC: Alasdair Kergon <agk@redhat.com> CC: Mike Snitzer <snitzer@kernel.org> CC: dm-devel@redhat.com Acked-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> --- drivers/md/dm.c | 20 +++++++++++--------- include/linux/device-mapper.h | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 64a1f306c96c..f7212e8fc27f 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -724,7 +724,7 @@ static struct table_device *open_table_device(struct mapped_device *md, dev_t dev, blk_mode_t mode) { struct table_device *td; - struct block_device *bdev; + struct bdev_handle *bdev_handle; u64 part_off; int r; @@ -733,9 +733,9 @@ static struct table_device *open_table_device(struct mapped_device *md, return ERR_PTR(-ENOMEM); refcount_set(&td->count, 1); - bdev = blkdev_get_by_dev(dev, mode, _dm_claim_ptr, NULL); - if (IS_ERR(bdev)) { - r = PTR_ERR(bdev); + bdev_handle = bdev_open_by_dev(dev, mode, _dm_claim_ptr, NULL); + if (IS_ERR(bdev_handle)) { + r = PTR_ERR(bdev_handle); goto out_free_td; } @@ -745,20 +745,22 @@ static struct table_device *open_table_device(struct mapped_device *md, * called. */ if (md->disk->slave_dir) { - r = bd_link_disk_holder(bdev, md->disk); + r = bd_link_disk_holder(bdev_handle->bdev, md->disk); if (r) goto out_blkdev_put; } td->dm_dev.mode = mode; - td->dm_dev.bdev = bdev; - td->dm_dev.dax_dev = fs_dax_get_by_bdev(bdev, &part_off, NULL, NULL); + td->dm_dev.bdev = bdev_handle->bdev; + td->dm_dev.bdev_handle = bdev_handle; + td->dm_dev.dax_dev = fs_dax_get_by_bdev(bdev_handle->bdev, &part_off, + NULL, NULL); format_dev_t(td->dm_dev.name, dev); list_add(&td->list, &md->table_devices); return td; out_blkdev_put: - blkdev_put(bdev, _dm_claim_ptr); + bdev_release(bdev_handle); out_free_td: kfree(td); return ERR_PTR(r); @@ -771,7 +773,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md { if (md->disk->slave_dir) bd_unlink_disk_holder(td->dm_dev.bdev, md->disk); - blkdev_put(td->dm_dev.bdev, _dm_claim_ptr); + bdev_release(td->dm_dev.bdev_handle); put_dax(td->dm_dev.dax_dev); list_del(&td->list); kfree(td); diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 69d0435c7ebb..772ab4d74d94 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -165,6 +165,7 @@ void dm_error(const char *message); struct dm_dev { struct block_device *bdev; + struct bdev_handle *bdev_handle; struct dax_device *dax_dev; blk_mode_t mode; char name[16]; -- 2.35.3
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: Christian Brauner <brauner@kernel.org> Cc: Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>, Mike Snitzer <snitzer@kernel.org>, linux-block@vger.kernel.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Alasdair Kergon <agk@redhat.com> Subject: [dm-devel] [PATCH 10/29] dm: Convert to bdev_open_by_dev() Date: Wed, 27 Sep 2023 11:34:16 +0200 [thread overview] Message-ID: <20230927093442.25915-10-jack@suse.cz> (raw) In-Reply-To: <20230818123232.2269-1-jack@suse.cz> Convert device mapper to use bdev_open_by_dev() and pass the handle around. CC: Alasdair Kergon <agk@redhat.com> CC: Mike Snitzer <snitzer@kernel.org> CC: dm-devel@redhat.com Acked-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> --- drivers/md/dm.c | 20 +++++++++++--------- include/linux/device-mapper.h | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 64a1f306c96c..f7212e8fc27f 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -724,7 +724,7 @@ static struct table_device *open_table_device(struct mapped_device *md, dev_t dev, blk_mode_t mode) { struct table_device *td; - struct block_device *bdev; + struct bdev_handle *bdev_handle; u64 part_off; int r; @@ -733,9 +733,9 @@ static struct table_device *open_table_device(struct mapped_device *md, return ERR_PTR(-ENOMEM); refcount_set(&td->count, 1); - bdev = blkdev_get_by_dev(dev, mode, _dm_claim_ptr, NULL); - if (IS_ERR(bdev)) { - r = PTR_ERR(bdev); + bdev_handle = bdev_open_by_dev(dev, mode, _dm_claim_ptr, NULL); + if (IS_ERR(bdev_handle)) { + r = PTR_ERR(bdev_handle); goto out_free_td; } @@ -745,20 +745,22 @@ static struct table_device *open_table_device(struct mapped_device *md, * called. */ if (md->disk->slave_dir) { - r = bd_link_disk_holder(bdev, md->disk); + r = bd_link_disk_holder(bdev_handle->bdev, md->disk); if (r) goto out_blkdev_put; } td->dm_dev.mode = mode; - td->dm_dev.bdev = bdev; - td->dm_dev.dax_dev = fs_dax_get_by_bdev(bdev, &part_off, NULL, NULL); + td->dm_dev.bdev = bdev_handle->bdev; + td->dm_dev.bdev_handle = bdev_handle; + td->dm_dev.dax_dev = fs_dax_get_by_bdev(bdev_handle->bdev, &part_off, + NULL, NULL); format_dev_t(td->dm_dev.name, dev); list_add(&td->list, &md->table_devices); return td; out_blkdev_put: - blkdev_put(bdev, _dm_claim_ptr); + bdev_release(bdev_handle); out_free_td: kfree(td); return ERR_PTR(r); @@ -771,7 +773,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md { if (md->disk->slave_dir) bd_unlink_disk_holder(td->dm_dev.bdev, md->disk); - blkdev_put(td->dm_dev.bdev, _dm_claim_ptr); + bdev_release(td->dm_dev.bdev_handle); put_dax(td->dm_dev.dax_dev); list_del(&td->list); kfree(td); diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 69d0435c7ebb..772ab4d74d94 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -165,6 +165,7 @@ void dm_error(const char *message); struct dm_dev { struct block_device *bdev; + struct bdev_handle *bdev_handle; struct dax_device *dax_dev; blk_mode_t mode; char name[16]; -- 2.35.3 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2023-09-27 9:34 UTC|newest] Thread overview: 166+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-23 10:48 [PATCH v3 0/29] block: Make blkdev_get_by_*() return handle Jan Kara 2023-09-27 9:34 ` [dm-devel] [PATCH v4 " Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-09-27 9:34 ` [f2fs-dev] " Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-08-23 10:48 ` [PATCH v3 " Jan Kara 2023-08-23 10:48 ` [dm-devel] " Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-23 10:48 ` [f2fs-dev] " Jan Kara 2023-08-23 10:48 ` [PATCH 01/29] block: Provide bdev_open_* functions Jan Kara 2023-08-25 11:44 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 02/29] block: Use bdev_open_by_dev() in blkdev_open() Jan Kara 2023-08-25 2:28 ` Al Viro 2023-08-25 9:45 ` Jan Kara 2023-08-25 13:29 ` Christian Brauner 2023-08-28 16:46 ` Jan Kara 2023-08-29 11:03 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 03/29] block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset() Jan Kara 2023-08-25 11:45 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 04/29] drdb: Convert to use bdev_open_by_path() Jan Kara 2023-08-25 11:47 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 05/29] pktcdvd: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 11:53 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 06/29] rnbd-srv: Convert to use bdev_open_by_path() Jan Kara 2023-08-25 11:55 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 07/29] xen/blkback: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 11:56 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 08/29] zram: Convert to use bdev_open_by_dev() Jan Kara 2023-08-25 11:57 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 09/29] bcache: Convert to bdev_open_by_path() Jan Kara 2023-08-25 12:06 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 10/29] dm: Convert to bdev_open_by_dev() Jan Kara 2023-08-23 10:48 ` [dm-devel] " Jan Kara 2023-08-25 12:08 ` Christian Brauner 2023-08-25 12:08 ` [dm-devel] " Christian Brauner 2023-08-23 10:48 ` [PATCH 11/29] md: " Jan Kara 2023-08-25 12:09 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 12/29] mtd: block2mtd: Convert to bdev_open_by_dev/path() Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-25 12:11 ` Christian Brauner 2023-08-25 12:11 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 13/29] nvmet: Convert to bdev_open_by_path() Jan Kara 2023-08-23 19:36 ` Chaitanya Kulkarni 2023-08-25 12:12 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 14/29] s390/dasd: " Jan Kara 2023-08-25 12:14 ` Christian Brauner 2023-09-27 21:43 ` Stefan Haberland 2023-10-02 11:24 ` Jan Kara 2023-08-23 10:48 ` [PATCH 15/29] scsi: target: " Jan Kara 2023-08-25 12:15 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 16/29] PM: hibernate: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 12:17 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 17/29] PM: hibernate: Drop unused snapshot_test argument Jan Kara 2023-08-25 12:18 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 18/29] mm/swap: Convert to use bdev_open_by_dev() Jan Kara 2023-08-25 12:19 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 19/29] fs: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 12:20 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 20/29] btrfs: Convert to bdev_open_by_path() Jan Kara 2023-08-25 12:26 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 21/29] erofs: Convert to use bdev_open_by_path() Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-25 12:27 ` Christian Brauner 2023-08-25 12:27 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 22/29] ext4: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 12:29 ` Christian Brauner 2023-08-23 10:48 ` [f2fs-dev] [PATCH 23/29] f2fs: Convert to bdev_open_by_dev/path() Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-25 12:30 ` [f2fs-dev] " Christian Brauner 2023-08-25 12:30 ` Christian Brauner 2023-08-28 12:57 ` [f2fs-dev] " Chao Yu 2023-08-28 12:57 ` Chao Yu 2023-08-28 16:35 ` [f2fs-dev] " Jan Kara 2023-08-28 16:35 ` Jan Kara 2023-08-23 10:48 ` [PATCH 24/29] jfs: Convert to bdev_open_by_dev() Jan Kara 2023-08-25 12:31 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 25/29] nfs/blocklayout: Convert to use bdev_open_by_dev/path() Jan Kara 2023-08-25 12:33 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 26/29] ocfs2: Convert to use bdev_open_by_dev() Jan Kara 2023-08-25 12:34 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 27/29] reiserfs: Convert to bdev_open_by_dev/path() Jan Kara 2023-08-23 10:48 ` Jan Kara 2023-08-25 12:35 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 28/29] xfs: Convert to bdev_open_by_path() Jan Kara 2023-08-23 22:11 ` Dave Chinner 2023-08-24 10:28 ` Jan Kara 2023-08-24 20:29 ` Jan Kara 2023-08-24 23:06 ` Dave Chinner 2023-08-25 12:38 ` Christian Brauner 2023-08-23 10:48 ` [PATCH 29/29] block: Remove blkdev_get_by_*() functions Jan Kara 2023-08-25 12:42 ` Christian Brauner 2023-08-25 13:32 ` [PATCH v3 0/29] block: Make blkdev_get_by_*() return handle Christian Brauner 2023-08-25 13:32 ` Christian Brauner 2023-08-25 13:32 ` Christian Brauner 2023-08-25 13:32 ` [dm-devel] " Christian Brauner 2023-08-25 13:32 ` Christian Brauner 2023-08-25 13:32 ` [f2fs-dev] " Christian Brauner 2023-08-28 17:07 ` Jan Kara 2023-08-28 17:07 ` Jan Kara 2023-08-28 17:07 ` [dm-devel] " Jan Kara 2023-08-28 17:07 ` Jan Kara 2023-08-28 17:07 ` Jan Kara 2023-08-28 17:07 ` [f2fs-dev] " Jan Kara 2023-08-29 11:02 ` Christian Brauner 2023-08-29 11:02 ` Christian Brauner 2023-08-29 11:02 ` [dm-devel] " Christian Brauner 2023-08-29 11:02 ` Christian Brauner 2023-08-29 11:02 ` Christian Brauner 2023-08-29 11:02 ` [f2fs-dev] " Christian Brauner 2023-09-27 9:34 ` [PATCH 01/29] block: Provide bdev_open_* functions Jan Kara 2023-09-27 9:34 ` [PATCH 02/29] block: Use bdev_open_by_dev() in blkdev_open() Jan Kara 2023-09-27 9:34 ` [PATCH 03/29] block: Use bdev_open_by_dev() in disk_scan_partitions() and blkdev_bszset() Jan Kara 2023-09-27 9:34 ` [PATCH 04/29] drdb: Convert to use bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` [PATCH 05/29] pktcdvd: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 06/29] rnbd-srv: Convert to use bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` [PATCH 07/29] xen/blkback: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 08/29] zram: Convert to use bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 09/29] bcache: Convert to bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` Jan Kara [this message] 2023-09-27 9:34 ` [dm-devel] [PATCH 10/29] dm: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 11/29] md: " Jan Kara 2023-09-27 9:34 ` [PATCH 12/29] mtd: block2mtd: Convert to bdev_open_by_dev/path() Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-09-27 9:34 ` [PATCH 13/29] nvmet: Convert to bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` [PATCH 14/29] s390/dasd: " Jan Kara 2023-09-27 9:34 ` [PATCH 15/29] scsi: target: " Jan Kara 2023-09-27 15:36 ` Martin K. Petersen 2023-09-27 9:34 ` [PATCH 16/29] PM: hibernate: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 17/29] PM: hibernate: Drop unused snapshot_test argument Jan Kara 2023-09-27 9:34 ` [PATCH 18/29] mm/swap: Convert to use bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 19/29] fs: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 20/29] btrfs: Convert to bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` [PATCH 21/29] erofs: Convert to use bdev_open_by_path() Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-09-27 9:34 ` [PATCH 22/29] ext4: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 23/29] f2fs: Convert to bdev_open_by_dev/path() Jan Kara 2023-09-27 9:34 ` [f2fs-dev] " Jan Kara 2023-09-27 9:34 ` [PATCH 24/29] jfs: Convert to bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 25/29] nfs/blocklayout: Convert to use bdev_open_by_dev/path() Jan Kara 2023-09-27 9:34 ` [PATCH 26/29] ocfs2: Convert to use bdev_open_by_dev() Jan Kara 2023-09-27 9:34 ` [PATCH 27/29] reiserfs: Convert to bdev_open_by_dev/path() Jan Kara 2023-09-27 9:34 ` Jan Kara 2023-09-27 9:34 ` [PATCH 28/29] xfs: Convert to bdev_open_by_path() Jan Kara 2023-09-27 15:40 ` Darrick J. Wong 2023-09-27 9:34 ` [PATCH 29/29] block: Remove blkdev_get_by_*() functions Jan Kara 2023-09-27 14:19 ` [PATCH v4 0/29] block: Make blkdev_get_by_*() return handle Jens Axboe 2023-09-27 14:19 ` Jens Axboe 2023-09-27 14:19 ` Jens Axboe 2023-09-27 14:19 ` [dm-devel] " Jens Axboe 2023-09-27 14:19 ` Jens Axboe 2023-09-27 14:19 ` [f2fs-dev] " Jens Axboe 2023-09-27 16:21 ` Christian Brauner 2023-09-27 16:21 ` Christian Brauner 2023-09-27 16:21 ` Christian Brauner 2023-09-27 16:21 ` [dm-devel] " Christian Brauner 2023-09-27 16:21 ` Christian Brauner 2023-09-27 16:21 ` [f2fs-dev] " Christian Brauner 2023-10-02 7:57 ` Jan Kara 2023-10-02 7:57 ` Jan Kara 2023-10-02 7:57 ` [dm-devel] " Jan Kara 2023-10-02 7:57 ` Jan Kara 2023-10-02 7:57 ` Jan Kara 2023-10-02 7:57 ` [f2fs-dev] " Jan Kara -- strict thread matches above, loose matches on Subject: below -- 2023-08-11 11:04 [PATCH v2 " Jan Kara 2023-08-11 11:04 ` [PATCH 10/29] dm: Convert to bdev_open_by_dev() Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230927093442.25915-10-jack@suse.cz \ --to=jack@suse.cz \ --cc=agk@redhat.com \ --cc=brauner@kernel.org \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --cc=hch@lst.de \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=snitzer@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.