summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-07-05 10:45:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-07-05 10:45:31 -0700
commit29206c6314a3e5242b23b61cd1270cba9e93b415 (patch)
treeaab89a5570a9238b43c40d882eb80a770357c7b5 /block
parent9fbe565cb78d10ca2619ee23eac27262cff45629 (diff)
parent3197d48a7c04eee3e50bd54ef7e17e383b8a919e (diff)
downloadlinux-29206c6314a3e5242b23b61cd1270cba9e93b415.tar.bz2
Merge tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: - NVMe fixes from Christoph: - Fix crash in multi-path disk add (Christoph) - Fix ignore of identify error (Sagi) - Fix a compiler complaint that a function should be static (Wei) * tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block: block: make function __bio_integrity_free() static nvme: fix a crash in nvme_mpath_add_disk nvme: fix identify error status silent ignore
Diffstat (limited to 'block')
-rw-r--r--block/bio-integrity.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4707e90b8ee5..9ffd7e289554 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -24,7 +24,8 @@ void blk_flush_integrity(void)
flush_workqueue(kintegrityd_wq);
}
-void __bio_integrity_free(struct bio_set *bs, struct bio_integrity_payload *bip)
+static void __bio_integrity_free(struct bio_set *bs,
+ struct bio_integrity_payload *bip)
{
if (bs && mempool_initialized(&bs->bio_integrity_pool)) {
if (bip->bip_vec)