From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Wed, 9 Apr 2014 02:59:31 +0000 (-0400)
Subject: block: Ensure we only enable integrity metadata for reads and writes
X-Git-Tag: v3.15-rc1~35^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e69f18f06b97ed29645d020500222bfcec2b42b2;p=karo-tx-linux.git

block: Ensure we only enable integrity metadata for reads and writes

We'd occasionally attempt to generate protection information for flushes
and other requests with a zero payload. Make sure we only attempt to
enable integrity for reads and writes.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index b355b98dbf1b..1c2ce0c87711 100644
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -182,6 +182,9 @@ static int bdev_integrity_enabled(struct block_device *bdev, int rw)
  */
 int bio_integrity_enabled(struct bio *bio)
 {
+	if (!bio_is_rw(bio))
+		return 0;
+
 	/* Already protected? */
 	if (bio_integrity(bio))
 		return 0;