From: Christoph Hellwig <hch@lst.de>
To: Kaitao Cheng <pilgrimtao@gmail.com>
Cc: axboe@kernel.dk, hch@lst.de, sth@linux.ibm.com,
viro@zeniv.linux.org.uk, clm@fb.com, jaegeuk@kernel.org,
hch@infradead.org, mark@fasheh.com, dhowells@redhat.com,
balbi@kernel.org, damien.lemoal@wdc.com, bvanassche@acm.org,
ming.lei@redhat.com, martin.petersen@oracle.com,
satyat@google.com, chaitanya.kulkarni@wdc.com,
houtao1@huawei.com, asml.silence@gmail.com, ajay.joshi@wdc.com,
linux-kernel@vger.kernel.org, songmuchun@bytedance.com,
hoeppner@linux.ibm.com, heiko.carstens@de.ibm.com,
gor@linux.ibm.com, borntraeger@de.ibm.com,
linux-s390@vger.kernel.org, sagi@grimberg.me,
linux-nvme@lists.infradead.org, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org, josef@toxicpanda.com,
dsterba@suse.com, linux-btrfs@vger.kernel.org, chao@kernel.org,
linux-f2fs-devel@lists.sourceforge.net, darrick.wong@oracle.com,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
jlbec@evilplan.org, joseph.qi@linux.alibaba.com,
ocfs2-devel@oss.oracle.com, deepa.kernel@gmail.com
Subject: [Ocfs2-devel] [PATCH v2] blkdev: Replace blksize_bits() with ilog2()
Date: Fri, 29 May 2020 16:15:55 +0200 [thread overview]
Message-ID: <20200529141555.GA3249@lst.de> (raw)
In-Reply-To: <20200529141100.37519-1-pilgrimtao@gmail.com>
> ns->size = i_size_read(ns->bdev->bd_inode);
> - ns->blksize_shift = blksize_bits(bdev_logical_block_size(ns->bdev));
> + ns->blksize_shift = ilog2(bdev_logical_block_size(ns->bdev));
This should just be:
ns->blksize_shift = ns->bdev->bd_inode->i_blkbits;
> diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
> index 777734d1b4e5..55adb134451b 100644
> --- a/drivers/s390/block/dasd_ioctl.c
> +++ b/drivers/s390/block/dasd_ioctl.c
> @@ -228,7 +228,7 @@ dasd_format(struct dasd_block *block, struct format_data_t *fdata)
> */
> if (fdata->start_unit == 0) {
> struct block_device *bdev = bdget_disk(block->gdp, 0);
> - bdev->bd_inode->i_blkbits = blksize_bits(fdata->blksize);
> + bdev->bd_inode->i_blkbits = ilog2(fdata->blksize);
This also needs to set bdev->bd_block_size, so this probably warrants
a separate fix that be backported. It might be nice to split out
a helper that sets bd_block_size and bd_inode->i_blkbits together
so that such a use is more obvious.
> } else if (inode->i_bdev) {
> blksize = bdev_logical_block_size(inode->i_bdev);
> - blkbits = blksize_bits(blksize);
> + blkbits = ilog2(blksize);
This can just use inode->i_bdev->bd_inode->i_blkbits.
> diff --git a/fs/buffer.c b/fs/buffer.c
> index fc8831c392d7..fa92e0afe349 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -907,7 +907,7 @@ static sector_t blkdev_max_block(struct block_device *bdev, unsigned int size)
> loff_t sz = i_size_read(bdev->bd_inode);
>
> if (sz) {
> - unsigned int sizebits = blksize_bits(size);
> + unsigned int sizebits = ilog2(size);
bdev->bd_inode->i_blkbits.
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 1543b5af400e..7ea2cd3effcc 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1148,7 +1148,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
>
> if (align & blocksize_mask) {
> if (bdev)
> - blkbits = blksize_bits(bdev_logical_block_size(bdev));
> + blkbits = ilog2(bdev_logical_block_size(bdev));
bdev->bd_inode->i_blkbits.
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index cb05f71cf850..b896da27942a 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3458,7 +3458,7 @@ static int check_direct_IO(struct inode *inode, struct iov_iter *iter,
>
> if (align & blocksize_mask) {
> if (bdev)
> - blkbits = blksize_bits(bdev_logical_block_size(bdev));
> + blkbits = ilog2(bdev_logical_block_size(bdev));
bdev->bd_inode->i_blkbits.
> blocksize_mask = (1 << blkbits) - 1;
> if (align & blocksize_mask)
> return -EINVAL;
> diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
> index ec7b78e6feca..2a807657d544 100644
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@ -203,7 +203,7 @@ static loff_t
> iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
> struct iomap_dio *dio, struct iomap *iomap)
> {
> - unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev));
> + unsigned int blkbits = ilog2(bdev_logical_block_size(iomap->bdev));
iomap->bdev->bd_inode->i_blkbits.
next prev parent reply other threads:[~2020-05-29 14:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 14:11 [Ocfs2-devel] [PATCH v2] blkdev: Replace blksize_bits() with ilog2() Kaitao Cheng
2020-05-29 14:13 ` Jens Axboe
2020-06-01 7:22 ` Tao pilgrim
2020-06-01 8:44 ` Greg KH
2020-06-02 5:51 ` Christoph Hellwig
2020-06-02 6:13 ` Greg KH
2020-05-29 14:15 ` Christoph Hellwig [this message]
2020-05-29 20:27 ` Matthew Wilcox
2020-05-29 22:27 ` Bart Van Assche
2020-05-29 22:39 ` Jens Axboe
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=20200529141555.GA3249@lst.de \
--to=hch@lst.de \
--cc=ajay.joshi@wdc.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=balbi@kernel.org \
--cc=borntraeger@de.ibm.com \
--cc=bvanassche@acm.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=chao@kernel.org \
--cc=clm@fb.com \
--cc=damien.lemoal@wdc.com \
--cc=darrick.wong@oracle.com \
--cc=deepa.kernel@gmail.com \
--cc=dhowells@redhat.com \
--cc=dsterba@suse.com \
--cc=gor@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=heiko.carstens@de.ibm.com \
--cc=hoeppner@linux.ibm.com \
--cc=houtao1@huawei.com \
--cc=jaegeuk@kernel.org \
--cc=jlbec@evilplan.org \
--cc=josef@toxicpanda.com \
--cc=joseph.qi@linux.alibaba.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=pilgrimtao@gmail.com \
--cc=sagi@grimberg.me \
--cc=satyat@google.com \
--cc=songmuchun@bytedance.com \
--cc=sth@linux.ibm.com \
--cc=viro@zeniv.linux.org.uk \
/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).