Skip to content

block: initialize auto integrity buffer opaque #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+6 −5
Open

block: initialize auto integrity buffer opaque #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions block/bio-integrity-auto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ bool bio_integrity_prep(struct bio *bio)
struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
struct bio_integrity_data *bid;
bool set_flags = true;
gfp_t gfp = GFP_NOIO;
bool zero_buffer = false;

if (!bi)
return true;
Expand Down Expand Up @@ -139,9 +139,10 @@ bool bio_integrity_prep(struct bio *bio)
if (bi_offload_capable(bi))
return true;
set_flags = false;
gfp |= __GFP_ZERO;
} else if (bi->csum_type == BLK_INTEGRITY_CSUM_NONE)
gfp |= __GFP_ZERO;
zero_buffer = true;
} else {
zero_buffer = bi->metadata_size > bi->pi_tuple_size;
}
break;
default:
return true;
Expand All @@ -154,7 +155,7 @@ bool bio_integrity_prep(struct bio *bio)
bio_integrity_init(bio, &bid->bip, &bid->bvec, 1);
bid->bio = bio;
bid->bip.bip_flags |= BIP_BLOCK_INTEGRITY;
bio_integrity_alloc_buf(bio, gfp & __GFP_ZERO);
bio_integrity_alloc_buf(bio, zero_buffer);

bip_set_seed(&bid->bip, bio->bi_iter.bi_sector);

Expand Down