Merge tag 'tty-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[sfrench/cifs-2.6.git] / block / bio-integrity.c

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4db620849515f7c42843e4825a89918687becd28..fb95dbb21dd88516de76fc13138621f77bdf1457 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -276,8 +276,12 @@ bool bio_integrity_prep(struct bio *bio)
                ret = bio_integrity_add_page(bio, virt_to_page(buf),
                                             bytes, offset);
 
-               if (ret == 0)
-                       return false;
+               if (ret == 0) {
+                       printk(KERN_ERR "could not attach integrity payload\n");
+                       kfree(buf);
+                       status = BLK_STS_RESOURCE;
+                       goto err_end_io;
+               }
 
                if (ret < bytes)
                        break;