diff for duplicates of <20151209102123.GA3173@mwanda> diff --git a/a/1.txt b/N1/1.txt index b2bf661..655aef1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ index e6ba501..711e4d8d 100644 /* Allocate bio integrity payload and integrity vectors */ bip = bio_integrity_alloc(bio, GFP_NOIO, nr_pages); -- if (unlikely(bip = NULL)) { +- if (unlikely(bip == NULL)) { + if (IS_ERR(bip)) { printk(KERN_ERR "could not allocate data integrity bioset\n"); kfree(buf); @@ -22,11 +22,11 @@ index e6ba501..711e4d8d 100644 bip->bip_flags |= BIP_BLOCK_INTEGRITY; @@ -465,9 +465,8 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src, - BUG_ON(bip_src = NULL); + BUG_ON(bip_src == NULL); bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt); - -- if (bip = NULL) +- if (bip == NULL) - return -EIO; + if (IS_ERR(bip)) + return PTR_ERR(bip); diff --git a/a/content_digest b/N1/content_digest index 2bd443e..cacb4c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] blk-integrity: checking for NULL instead of IS_ERR\0" - "Date\0Wed, 09 Dec 2015 10:21:23 +0000\0" + "Date\0Wed, 9 Dec 2015 13:21:23 +0300\0" "To\0Jens Axboe <axboe@kernel.dk>" " Keith Busch <keith.busch@intel.com>\0" "Cc\0linux-block@vger.kernel.org" @@ -22,7 +22,7 @@ " \n" " \t/* Allocate bio integrity payload and integrity vectors */\n" " \tbip = bio_integrity_alloc(bio, GFP_NOIO, nr_pages);\n" - "-\tif (unlikely(bip = NULL)) {\n" + "-\tif (unlikely(bip == NULL)) {\n" "+\tif (IS_ERR(bip)) {\n" " \t\tprintk(KERN_ERR \"could not allocate data integrity bioset\\n\");\n" " \t\tkfree(buf);\n" @@ -32,11 +32,11 @@ " \n" " \tbip->bip_flags |= BIP_BLOCK_INTEGRITY;\n" "@@ -465,9 +465,8 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src,\n" - " \tBUG_ON(bip_src = NULL);\n" + " \tBUG_ON(bip_src == NULL);\n" " \n" " \tbip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);\n" "-\n" - "-\tif (bip = NULL)\n" + "-\tif (bip == NULL)\n" "-\t\treturn -EIO;\n" "+\tif (IS_ERR(bip))\n" "+\t\treturn PTR_ERR(bip);\n" @@ -44,4 +44,4 @@ " \tmemcpy(bip->bip_vec, bip_src->bip_vec,\n" " \t bip_src->bip_vcnt * sizeof(struct bio_vec));" -5dedf4fa15876de3e870030d4df368a09db4a6a976fc77de02d212b73d758917 +a71f2780e1888da03cc7439c59a2e82c1bd5e21abe367477a83f177603672dca
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.