From: Kent Overstreet <koverstreet@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kent Overstreet <koverstreet@google.com>,
axboe@kernel.dk,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: [PATCH 27/27] bio-integrity: Add explicit field for owner of bip_buf
Date: Tue, 19 Feb 2013 16:22:41 -0800 [thread overview]
Message-ID: <1361319761-23873-28-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1361319761-23873-1-git-send-email-koverstreet@google.com>
This was the only real user of BIO_CLONED, which didn't have very clear
semantics. Convert to its own flag so we can get rid of BIO_CLONED.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: Martin K. Petersen <martin.petersen@oracle.com>
---
fs/bio-integrity.c | 5 ++---
include/linux/bio.h | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index ca7b02d..8fb4291 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -97,9 +97,7 @@ void bio_integrity_free(struct bio *bio)
struct bio_integrity_payload *bip = bio->bi_integrity;
struct bio_set *bs = bio->bi_pool;
- /* A cloned bio doesn't own the integrity metadata */
- if (!bio_flagged(bio, BIO_CLONED) && !bio_flagged(bio, BIO_FS_INTEGRITY)
- && bip->bip_buf != NULL)
+ if (bip->bip_owns_buf)
kfree(bip->bip_buf);
if (bs) {
@@ -386,6 +384,7 @@ int bio_integrity_prep(struct bio *bio)
return -EIO;
}
+ bip->bip_owns_buf = 1;
bip->bip_buf = buf;
bip->bip_size = len;
bip->bip_sector = bio->bi_sector;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 794bcd0..ef24466 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -187,6 +187,7 @@ struct bio_integrity_payload {
unsigned short bip_slab; /* slab the bip came from */
unsigned short bip_vcnt; /* # of integrity bio_vecs */
unsigned short bip_idx; /* current bip_vec index */
+ unsigned bip_owns_buf:1; /* should free bip_buf */
struct work_struct bip_work; /* I/O completion */
--
1.7.12
prev parent reply other threads:[~2013-02-20 0:23 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 0:22 [PATCH 00/27] Block cleanups - prep work for immutable bio vecs/dio rewrite Kent Overstreet
2013-02-20 0:22 ` [PATCH 01/27] block: Reorder struct bio_set Kent Overstreet
2013-02-20 0:22 ` [PATCH 02/27] block: Avoid deadlocks with bio allocation by stacking drivers Kent Overstreet
2013-02-20 0:22 ` [PATCH 03/27] block: Fix a buffer overrun in bio_integrity_split() Kent Overstreet
2013-02-20 0:22 ` [PATCH 04/27] block: Convert integrity to bvec_alloc_bs() Kent Overstreet
2013-05-09 19:43 ` Bjorn Helgaas
2013-02-20 0:22 ` [PATCH 05/27] block: Add bio_advance() Kent Overstreet
2013-02-20 0:22 ` [PATCH 06/27] block: Refactor blk_update_request() Kent Overstreet
2013-02-20 0:22 ` [PATCH 07/27] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2013-02-20 0:22 ` [PATCH 08/27] block: Add bio_end_sector() Kent Overstreet
2013-02-20 0:22 ` [PATCH 09/27] block: Use bio_sectors() more consistently Kent Overstreet
2013-02-20 16:43 ` Ed Cashin
2013-02-20 0:22 ` [PATCH 10/27] block: Change bio_split() to respect the current value of bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 11/27] block: Remove bi_idx references Kent Overstreet
2013-02-20 0:22 ` [PATCH 12/27] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 13/27] block: Add submit_bio_wait(), remove from md Kent Overstreet
2013-02-20 0:22 ` [PATCH 14/27] raid10: Use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 15/27] raid1: use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 16/27] raid5: " Kent Overstreet
2013-02-20 0:22 ` [PATCH 17/27] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 18/27] block: Add bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 19/27] pktcdvd: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 20/27] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 21/27] raid1: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 22/27] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2013-02-20 0:22 ` [PATCH 23/27] block: Add bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 24/27] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 25/27] block: Add bio_alloc_pages() Kent Overstreet
2013-02-20 0:22 ` [PATCH 26/27] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2013-03-26 18:11 ` Andrew Morton
2013-03-26 19:42 ` Kent Overstreet
2013-02-20 0:22 ` Kent Overstreet [this message]
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=1361319761-23873-28-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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
all inboxes | Powered by JetHome®