Revert "block: initialize integrity buffer to zero before writing it to media"
This reverts commit 9e8e62c4a8
.
This commit is contained in:
parent
8f420f8031
commit
5ac9b91c6d
1 changed files with 1 additions and 10 deletions
|
@ -216,7 +216,6 @@ bool bio_integrity_prep(struct bio *bio)
|
||||||
unsigned int bytes, offset, i;
|
unsigned int bytes, offset, i;
|
||||||
unsigned int intervals;
|
unsigned int intervals;
|
||||||
blk_status_t status;
|
blk_status_t status;
|
||||||
gfp_t gfp = GFP_NOIO;
|
|
||||||
|
|
||||||
if (!bi)
|
if (!bi)
|
||||||
return true;
|
return true;
|
||||||
|
@ -239,20 +238,12 @@ bool bio_integrity_prep(struct bio *bio)
|
||||||
if (!bi->profile->generate_fn ||
|
if (!bi->profile->generate_fn ||
|
||||||
!(bi->flags & BLK_INTEGRITY_GENERATE))
|
!(bi->flags & BLK_INTEGRITY_GENERATE))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
/*
|
|
||||||
* Zero the memory allocated to not leak uninitialized kernel
|
|
||||||
* memory to disk. For PI this only affects the app tag, but
|
|
||||||
* for non-integrity metadata it affects the entire metadata
|
|
||||||
* buffer.
|
|
||||||
*/
|
|
||||||
gfp |= __GFP_ZERO;
|
|
||||||
}
|
}
|
||||||
intervals = bio_integrity_intervals(bi, bio_sectors(bio));
|
intervals = bio_integrity_intervals(bi, bio_sectors(bio));
|
||||||
|
|
||||||
/* Allocate kernel buffer for protection data */
|
/* Allocate kernel buffer for protection data */
|
||||||
len = intervals * bi->tuple_size;
|
len = intervals * bi->tuple_size;
|
||||||
buf = kmalloc(len, gfp | q->bounce_gfp);
|
buf = kmalloc(len, GFP_NOIO | q->bounce_gfp);
|
||||||
status = BLK_STS_RESOURCE;
|
status = BLK_STS_RESOURCE;
|
||||||
if (unlikely(buf == NULL)) {
|
if (unlikely(buf == NULL)) {
|
||||||
printk(KERN_ERR "could not allocate integrity buffer\n");
|
printk(KERN_ERR "could not allocate integrity buffer\n");
|
||||||
|
|
Loading…
Add table
Reference in a new issue