diff mbox series

[v2,2/3] btrfs: fix argument type of btrfs_bio_clone_partial()

Message ID c69cf6f0b81a28dd04b62537e3b8b4f46bd36e1e.1626848677.git.naohiro.aota@wdc.com (mailing list archive)
State New, archived
Headers show
Series fix argument type of bio_trim() | expand

Commit Message

Naohiro Aota July 21, 2021, 6:26 a.m. UTC 
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

The offset and can never be negative use unsigned int instead of int type
for them.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
 fs/btrfs/extent_io.c | 6 ++++--
 fs/btrfs/extent_io.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Christoph Hellwig July 21, 2021, 6:37 a.m. UTC | #1 
On Wed, Jul 21, 2021 at 03:26:59PM +0900, Naohiro Aota wrote:
>  	btrfs_bio = btrfs_io_bio(bio);
>  	btrfs_io_bio_init(btrfs_bio);
>  
> -	bio_trim(bio, offset >> 9, size >> 9);
> +	bio_trim(bio, (sector_t)offset >> 9, (sector_t)size >> 9);

No need for the casts when shifting down.
Naohiro Aota July 21, 2021, 12:33 p.m. UTC | #2 
On Wed, Jul 21, 2021 at 07:37:48AM +0100, Christoph Hellwig wrote:
> On Wed, Jul 21, 2021 at 03:26:59PM +0900, Naohiro Aota wrote:
> >  	btrfs_bio = btrfs_io_bio(bio);
> >  	btrfs_io_bio_init(btrfs_bio);
> >  
> > -	bio_trim(bio, offset >> 9, size >> 9);
> > +	bio_trim(bio, (sector_t)offset >> 9, (sector_t)size >> 9);
> 
> No need for the casts when shifting down.

Ah, OK. As, I switched the type to "u64", they are actually the same
type anyway.
diff mbox series

Patch

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1f947e24091a..0040577c2f4e 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3153,11 +3153,13 @@  struct bio *btrfs_io_bio_alloc(unsigned int nr_iovecs)
 	return bio;
 }
 
-struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size)
+struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
 {
 	struct bio *bio;
 	struct btrfs_io_bio *btrfs_bio;
 
+	ASSERT(offset <= UINT_MAX && size <= UINT_MAX);
+
 	/* this will never fail when it's backed by a bioset */
 	bio = bio_clone_fast(orig, GFP_NOFS, &btrfs_bioset);
 	ASSERT(bio);
@@ -3165,7 +3167,7 @@  struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size)
 	btrfs_bio = btrfs_io_bio(bio);
 	btrfs_io_bio_init(btrfs_bio);
 
-	bio_trim(bio, offset >> 9, size >> 9);
+	bio_trim(bio, (sector_t)offset >> 9, (sector_t)size >> 9);
 	btrfs_bio->iter = bio->bi_iter;
 	return bio;
 }
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 62027f551b44..53abdc280451 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -280,7 +280,7 @@  void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
 struct bio *btrfs_bio_alloc(u64 first_byte);
 struct bio *btrfs_io_bio_alloc(unsigned int nr_iovecs);
 struct bio *btrfs_bio_clone(struct bio *bio);
-struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size);
+struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);
 
 int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
 		      u64 length, u64 logical, struct page *page,