fixups for immutable biovecs
Subsystems (2)
PATCH 1/1 fixups for immutable biovecs
Jens - for the "silence spurious compiler warnings", if you want to drop the previous version of that patch and replace with this one, it appears uninitialized_var() doesn't work on structs. And I somehow lost the btrfs fixes Chris Mason did for bio chaining and had to redo them so hopefully he can glance at them, but it does pass xfstests.
PATCH 1/2 block: Silence spurious compiler warnings
The uninitialized_var() macro appears to not work on structs...
Signed-off-by Kent Overstreet <[email protected]>
--- block/blk-merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block/blk-merge.c +3 -3
@@ -86,7 +86,7 @@ EXPORT_SYMBOL(blk_recount_segments);static int blk_phys_contig_segment (struct request_queue *q,struct bio *bio,struct bio *nxt) { -struct bio_vec end_bv, nxt_bv; +struct bio_vec end_bv = {NULL }, nxt_bv;struct bvec_iter iter;if (!blk_queue_cluster (q))
@@ -168,7 +168,7 @@ new_segment:int blk_rq_map_sg (struct request_queue *q,struct request *rq,struct scatterlist *sglist) { -struct bio_vec bvec, bvprv; +struct bio_vec bvec, bvprv = {NULL };struct req_iterator iter;struct scatterlist *sg;int nsegs, cluster;
@@ -230,7 +230,7 @@ EXPORT_SYMBOL(blk_rq_map_sg);int blk_bio_map_sg (struct request_queue *q,struct bio *bio,struct scatterlist *sglist) { -struct bio_vec bvec, bvprv; +struct bio_vec bvec, bvprv = {NULL };struct scatterlist *sg;int nsegs, cluster;struct bvec_iter iter;
Signature · 1 line
1.8.4.4
PATCH 2/2 block: fixup for generic bio chaining
In reply to Kent Overstreetbtrfs bits got lost in the rebase
Signed-off-by Kent Overstreet <[email protected]>
Cc Chris Mason <[email protected]>
--- fs/btrfs/disk-io.c | 2 +- fs/btrfs/volumes.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -1
@@ -1692,7 +1692,7 @@ static void end_workqueue_fn(struct btrfs_work *work) bio->bi_private = end_io_wq->private; bio->bi_end_io = end_io_wq->end_io;kfree (end_io_wq); -bio_endio (bio, error); +bio_endio_nodec (bio, error); }static int cleaner_kthread (void *arg)
fs/btrfs/volumes.c +2 -0
@@ -5297,6 +5297,8 @@ static void btrfs_end_bio(struct bio *bio, int err)if (!is_orig_bio) {bio_put (bio); bio = bbio->orig_bio; + }else { +atomic_inc (&bio->bi_remaining); } bio->bi_private = bbio->private; bio->bi_end_io = bbio->end_io;
Signature · 1 line
1.8.4.4