From: Christoph Hellwig <hch@lst.de>
To: Qian Cai <quic_qiancai@quicinc.com>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-raid@vger.kernel.org, Mike Snitzer <snitzer@redhat.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-kernel@vger.kernel.org, Josef Bacik <josef@toxicpanda.com>,
Coly Li <colyli@suse.de>,
linux-block@vger.kernel.org, Song Liu <song@kernel.org>,
dm-devel@redhat.com, target-devel@vger.kernel.org,
David Sterba <dsterba@suse.com>,
Phillip Lougher <phillip@squashfs.org.uk>,
linux-bcache@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
linux-btrfs@vger.kernel.org
Subject: Re: [dm-devel] cleanup bio_kmalloc v2
Date: Thu, 31 Mar 2022 18:40:24 +0200 [thread overview]
Message-ID: <20220331164024.GA30404@lst.de> (raw)
In-Reply-To: <YkXYMGGbk/ZTbGaA@qian>
This should fix it:
diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c
index 930eb530fa622..fed99bb3df3be 100644
--- a/fs/squashfs/block.c
+++ b/fs/squashfs/block.c
@@ -72,6 +72,13 @@ static int copy_bio_to_actor(struct bio *bio,
return copied_bytes;
}
+static void squashfs_bio_free(struct bio *bio)
+{
+ bio_free_pages(bio);
+ bio_uninit(bio);
+ kfree(bio);
+}
+
static int squashfs_bio_read(struct super_block *sb, u64 index, int length,
struct bio **biop, int *block_offset)
{
@@ -118,9 +125,7 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length,
return 0;
out_free_bio:
- bio_free_pages(bio);
- bio_uninit(bio);
- kfree(bio);
+ squashfs_bio_free(bio);
return error;
}
@@ -183,8 +188,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,
data = bvec_virt(bvec);
length |= data[0] << 8;
}
- bio_free_pages(bio);
- bio_put(bio);
+ squashfs_bio_free(bio);
compressed = SQUASHFS_COMPRESSED(length);
length = SQUASHFS_COMPRESSED_SIZE(length);
@@ -217,8 +221,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,
}
out_free_bio:
- bio_free_pages(bio);
- bio_put(bio);
+ squashfs_bio_free(bio);
out:
if (res < 0) {
ERROR("Failed to read block 0x%llx: %d\n", index, res);
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Qian Cai <quic_qiancai@quicinc.com>
Cc: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
Song Liu <song@kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
Phillip Lougher <phillip@squashfs.org.uk>,
linux-block@vger.kernel.org, dm-devel@redhat.com,
linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org,
linux-raid@vger.kernel.org, target-devel@vger.kernel.org,
linux-btrfs@vger.kernel.org
Subject: Re: cleanup bio_kmalloc v2
Date: Thu, 31 Mar 2022 18:40:24 +0200 [thread overview]
Message-ID: <20220331164024.GA30404@lst.de> (raw)
In-Reply-To: <YkXYMGGbk/ZTbGaA@qian>
This should fix it:
diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c
index 930eb530fa622..fed99bb3df3be 100644
--- a/fs/squashfs/block.c
+++ b/fs/squashfs/block.c
@@ -72,6 +72,13 @@ static int copy_bio_to_actor(struct bio *bio,
return copied_bytes;
}
+static void squashfs_bio_free(struct bio *bio)
+{
+ bio_free_pages(bio);
+ bio_uninit(bio);
+ kfree(bio);
+}
+
static int squashfs_bio_read(struct super_block *sb, u64 index, int length,
struct bio **biop, int *block_offset)
{
@@ -118,9 +125,7 @@ static int squashfs_bio_read(struct super_block *sb, u64 index, int length,
return 0;
out_free_bio:
- bio_free_pages(bio);
- bio_uninit(bio);
- kfree(bio);
+ squashfs_bio_free(bio);
return error;
}
@@ -183,8 +188,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,
data = bvec_virt(bvec);
length |= data[0] << 8;
}
- bio_free_pages(bio);
- bio_put(bio);
+ squashfs_bio_free(bio);
compressed = SQUASHFS_COMPRESSED(length);
length = SQUASHFS_COMPRESSED_SIZE(length);
@@ -217,8 +221,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,
}
out_free_bio:
- bio_free_pages(bio);
- bio_put(bio);
+ squashfs_bio_free(bio);
out:
if (res < 0) {
ERROR("Failed to read block 0x%llx: %d\n", index, res);
next prev parent reply other threads:[~2022-03-31 16:40 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 6:15 [dm-devel] cleanup bio_kmalloc v2 Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-08 6:15 ` [dm-devel] [PATCH 1/5] btrfs: simplify ->flush_bio handling Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-08 22:07 ` [dm-devel] " Chaitanya Kulkarni
2022-03-08 22:07 ` Chaitanya Kulkarni
2022-03-08 6:15 ` [dm-devel] [PATCH 2/5] squashfs: always use bio_kmalloc in squashfs_bio_read Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-08 6:15 ` [dm-devel] [PATCH 3/5] target/pscsi: remove pscsi_get_bio Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-08 22:08 ` [dm-devel] " Chaitanya Kulkarni
2022-03-08 22:08 ` Chaitanya Kulkarni
2022-03-08 6:15 ` [dm-devel] [PATCH 4/5] block: turn bio_kmalloc into a simple kmalloc wrapper Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-09 3:06 ` [dm-devel] " Martin K. Petersen
2022-03-09 3:06 ` Martin K. Petersen
2022-03-31 21:18 ` [dm-devel] " Marek Szyprowski
2022-03-31 21:18 ` Marek Szyprowski
2022-03-31 21:22 ` [dm-devel] " Jens Axboe
2022-03-31 21:22 ` Jens Axboe
2022-04-01 4:57 ` [dm-devel] " Christoph Hellwig
2022-04-01 4:57 ` Christoph Hellwig
2022-03-08 6:15 ` [dm-devel] [PATCH 5/5] pktcdvd: stop using bio_reset Christoph Hellwig
2022-03-08 6:15 ` Christoph Hellwig
2022-03-08 22:10 ` [dm-devel] " Chaitanya Kulkarni
2022-03-08 22:10 ` Chaitanya Kulkarni
2022-03-30 14:29 ` [dm-devel] cleanup bio_kmalloc v2 Christoph Hellwig
2022-03-30 14:29 ` Christoph Hellwig
2022-03-30 14:37 ` [dm-devel] " Jens Axboe
2022-03-30 14:37 ` Jens Axboe
2022-03-30 14:49 ` [dm-devel] " Jens Axboe
2022-03-30 14:49 ` Jens Axboe
2022-03-31 16:34 ` [dm-devel] " Qian Cai
2022-03-31 16:34 ` Qian Cai
2022-03-31 16:40 ` Christoph Hellwig [this message]
2022-03-31 16:40 ` Christoph Hellwig
2022-03-31 16:48 ` [dm-devel] " Jens Axboe
2022-03-31 16:48 ` 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=20220331164024.GA30404@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=phillip@squashfs.org.uk \
--cc=quic_qiancai@quicinc.com \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=target-devel@vger.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: link
Be 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.