Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[cascardo/linux.git] / block / bio-integrity.c

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 711e4d8..63f72f0 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -26,6 +26,7 @@
 #include <linux/bio.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
+#include "blk.h"
 
 #define BIP_INLINE_VECS        4
 
@@ -53,7 +54,6 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
 {
        struct bio_integrity_payload *bip;
        struct bio_set *bs = bio->bi_pool;
-       unsigned long idx = BIO_POOL_NONE;
        unsigned inline_vecs;
 
        if (!bs || !bs->bio_integrity_pool) {
@@ -71,20 +71,22 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
        memset(bip, 0, sizeof(*bip));
 
        if (nr_vecs > inline_vecs) {
+               unsigned long idx = 0;
+
                bip->bip_vec = bvec_alloc(gfp_mask, nr_vecs, &idx,
                                          bs->bvec_integrity_pool);
                if (!bip->bip_vec)
                        goto err;
                bip->bip_max_vcnt = bvec_nr_vecs(idx);
+               bip->bip_slab = idx;
        } else {
                bip->bip_vec = bip->bip_inline_vecs;
                bip->bip_max_vcnt = inline_vecs;
        }
 
-       bip->bip_slab = idx;
        bip->bip_bio = bio;
        bio->bi_integrity = bip;
-       bio->bi_rw |= REQ_INTEGRITY;
+       bio->bi_opf |= REQ_INTEGRITY;
 
        return bip;
 err:
@@ -110,9 +112,7 @@ void bio_integrity_free(struct bio *bio)
                      bip->bip_vec->bv_offset);
 
        if (bs && bs->bio_integrity_pool) {
-               if (bip->bip_slab != BIO_POOL_NONE)
-                       bvec_free(bs->bvec_integrity_pool, bip->bip_vec,
-                                 bip->bip_slab);
+               bvec_free(bs->bvec_integrity_pool, bip->bip_vec, bip->bip_slab);
 
                mempool_free(bip, bs->bio_integrity_pool);
        } else {