From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
"Josef Bacik" <josef@toxicpanda.com>,
"Ilya Dryomov" <idryomov@gmail.com>,
"Jack Wang" <jinpu.wang@cloud.ionos.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Minchan Kim" <minchan@kernel.org>,
"Mike Snitzer" <snitzer@redhat.com>, "Song Liu" <song@kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
dm-devel@redhat.com, linux-block@vger.kernel.org,
drbd-dev@lists.linbit.com, nbd@other.debian.org,
ceph-devel@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-scsi@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 02/24] loop: remove loop_set_size
Date: Wed, 11 Nov 2020 09:26:36 +0100 [thread overview]
Message-ID: <20201111082658.3401686-3-hch@lst.de> (raw)
In-Reply-To: <20201111082658.3401686-1-hch@lst.de>
Just use set_capacity_revalidate_and_notify directly, as this function
can update the block device size as well when the last parameter is set
to true.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/block/loop.c | 37 +++++++------------------------------
1 file changed, 7 insertions(+), 30 deletions(-)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index cb1191d6e945f2..86eb7e0691eef5 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -241,23 +241,6 @@ loop_validate_block_size(unsigned short bsize)
return 0;
}
-/**
- * loop_set_size() - sets device size and notifies userspace
- * @lo: struct loop_device to set the size for
- * @size: new size of the loop device
- *
- * Callers must validate that the size passed into this function fits into
- * a sector_t, eg using loop_validate_size()
- */
-static void loop_set_size(struct loop_device *lo, loff_t size)
-{
- struct block_device *bdev = lo->lo_device;
-
- bd_set_nr_sectors(bdev, size);
-
- set_capacity_revalidate_and_notify(lo->lo_disk, size, false);
-}
-
static inline int
lo_do_transfer(struct loop_device *lo, int cmd,
struct page *rpage, unsigned roffs,
@@ -1076,7 +1059,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
struct address_space *mapping;
struct block_device *claimed_bdev = NULL;
int error;
- loff_t size;
bool partscan;
unsigned short bsize;
@@ -1164,9 +1146,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
loop_update_dio(lo);
loop_sysfs_init(lo);
- size = get_loop_size(lo, file);
- loop_set_size(lo, size);
-
+ set_capacity_revalidate_and_notify(lo->lo_disk, get_loop_size(lo, file),
+ true);
set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
block_size(inode->i_bdev) : PAGE_SIZE);
@@ -1402,9 +1383,9 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
lo->lo_flags |= prev_lo_flags & ~LOOP_SET_STATUS_CLEARABLE_FLAGS;
if (size_changed) {
- loff_t new_size = get_size(lo->lo_offset, lo->lo_sizelimit,
- lo->lo_backing_file);
- loop_set_size(lo, new_size);
+ set_capacity_revalidate_and_notify(lo->lo_disk,
+ get_size(lo->lo_offset, lo->lo_sizelimit,
+ lo->lo_backing_file), true);
}
loop_config_discard(lo);
@@ -1580,14 +1561,10 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) {
static int loop_set_capacity(struct loop_device *lo)
{
- loff_t size;
-
if (unlikely(lo->lo_state != Lo_bound))
return -ENXIO;
-
- size = get_loop_size(lo, lo->lo_backing_file);
- loop_set_size(lo, size);
-
+ set_capacity_revalidate_and_notify(lo->lo_disk,
+ get_loop_size(lo, lo->lo_backing_file), true);
return 0;
}
--
2.28.0
next prev parent reply other threads:[~2020-11-11 8:29 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 8:26 cleanup updating the size of block devices v2 Christoph Hellwig
2020-11-11 8:26 ` [PATCH 01/24] block: remove the call to __invalidate_device in check_disk_size_change Christoph Hellwig
2020-11-11 12:46 ` Hannes Reinecke
2020-11-11 8:26 ` Christoph Hellwig [this message]
2020-11-11 12:47 ` [PATCH 02/24] loop: remove loop_set_size Hannes Reinecke
2020-11-11 8:26 ` [PATCH 03/24] nvme: let set_capacity_revalidate_and_notify update the bdev size Christoph Hellwig
2020-11-11 13:06 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 04/24] sd: update the bdev size in sd_revalidate_disk Christoph Hellwig
2020-11-11 13:07 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 05/24] block: remove the update_bdev parameter from set_capacity_revalidate_and_notify Christoph Hellwig
2020-11-11 13:07 ` Hannes Reinecke
2020-11-12 19:22 ` Petr Vorel
2020-11-11 8:26 ` [PATCH 06/24] block: add a return value to set_capacity_and_notify Christoph Hellwig
2020-11-11 13:08 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 07/24] nbd: remove the call to set_blocksize Christoph Hellwig
2020-11-11 8:26 ` [PATCH 08/24] nbd: move the task_recv check into nbd_size_update Christoph Hellwig
2020-11-11 8:26 ` [PATCH 09/24] nbd: refactor size updates Christoph Hellwig
2020-11-11 8:26 ` [PATCH 10/24] nbd: validate the block size in nbd_set_size Christoph Hellwig
2020-11-11 8:26 ` [PATCH 11/24] nbd: use set_capacity_and_notify Christoph Hellwig
2020-11-11 8:26 ` [PATCH 12/24] aoe: don't call set_capacity from irq context Christoph Hellwig
2020-11-11 8:26 ` [PATCH 13/24] dm: use set_capacity_and_notify Christoph Hellwig
2020-11-11 13:57 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 14/24] pktcdvd: " Christoph Hellwig
2020-11-11 8:26 ` [PATCH 15/24] nvme: use set_capacity_and_notify in nvme_set_queue_dying Christoph Hellwig
2020-11-11 13:59 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 16/24] drbd: use set_capacity_and_notify Christoph Hellwig
2020-11-11 8:26 ` [PATCH 17/24] rbd: " Christoph Hellwig
2020-11-11 9:55 ` Ilya Dryomov
2020-11-11 10:06 ` Jinpu Wang
2020-11-11 8:26 ` [PATCH 18/24] rnbd: " Christoph Hellwig
2020-11-11 8:26 ` [PATCH 19/24] zram: " Christoph Hellwig
2020-11-11 8:26 ` [PATCH 20/24] dm-raid: " Christoph Hellwig
2020-11-11 14:00 ` Hannes Reinecke
2020-11-11 8:26 ` [PATCH 21/24] md: " Christoph Hellwig
2020-11-11 8:26 ` [PATCH 22/24] md: remove a spurious call to revalidate_disk_size in update_size Christoph Hellwig
2020-11-11 8:26 ` [PATCH 23/24] virtio-blk: remove a spurious call to revalidate_disk_size Christoph Hellwig
2020-11-11 8:26 ` [PATCH 24/24] block: unexport revalidate_disk_size Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2020-11-06 19:03 cleanup updating the size of block devices Christoph Hellwig
2020-11-06 19:03 ` [PATCH 02/24] loop: remove loop_set_size Christoph Hellwig
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=20201111082658.3401686-3-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=idryomov@gmail.com \
--cc=jasowang@redhat.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=josef@toxicpanda.com \
--cc=justin@coraid.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=minchan@kernel.org \
--cc=mst@redhat.com \
--cc=nbd@other.debian.org \
--cc=pbonzini@redhat.com \
--cc=roger.pau@citrix.com \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=stefanha@redhat.com \
--cc=xen-devel@lists.xenproject.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).