dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

btrfs: Kill some bi_idx references 

For immutable bio vecs, I've been auditing and removing bi_idx
references. These were harmless, but removing them will make auditing
easier.

scrub_bio_end_io_worker() was open coding a bio_reset() - but this
doesn't appear to have been needed for anything as right after it does a
bio_put(), and perusing the code it doesn't appear anything else was
holding a reference to the bio.

The other use end_bio_extent_readpage() was just for a pr_debug() -
changed it to something that might be a bit more useful.

Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Chris Mason <chris.mason@oracle.com>
CC: Stefan Behrens <sbehrens@giantdisaster.de>
This commit is contained in:
Kent Overstreet 2012-09-11 14:23:05 -06:00 committed by Chris Mason
parent 962197babe
commit be3940c0a9
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/extent_io.c
View File

@ -2306,8 +2306,8 @@ static void end_bio_extent_readpage(struct bio *bio, int err)
struct extent_state *cached = NULL;
struct extent_state *state;
pr_debug("end_bio_extent_readpage: bi_vcnt=%d, idx=%d, err=%d, "
"mirror=%ld\n", bio->bi_vcnt, bio->bi_idx, err,
pr_debug("end_bio_extent_readpage: bi_sector=%llu, err=%d, "
"mirror=%ld\n", (u64)bio->bi_sector, err,
(long int)bio->bi_bdev);
tree = &BTRFS_I(page->mapping->host)->io_tree;

15
fs/btrfs/scrub.c
View File

@ -1669,21 +1669,6 @@ static void scrub_bio_end_io_worker(struct btrfs_work *work)
scrub_block_put(sblock);
}
if (sbio->err) {
/* what is this good for??? */
sbio->bio->bi_flags &= ~(BIO_POOL_MASK - 1);
sbio->bio->bi_flags |= 1 << BIO_UPTODATE;
sbio->bio->bi_phys_segments = 0;
sbio->bio->bi_idx = 0;
for (i = 0; i < sbio->page_count; i++) {
struct bio_vec *bi;
bi = &sbio->bio->bi_io_vec[i];
bi->bv_offset = 0;
bi->bv_len = PAGE_SIZE;
}
}
bio_put(sbio->bio);
sbio->bio = NULL;
spin_lock(&sdev->list_lock);