From 0f21a468e70a34fe5396ec3b963bda943952dd3c Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Wed, 16 Jul 2008 16:09:06 -0400
Subject: [PATCH] --- yaml --- r: 101977 b: refs/heads/master c:
 d442cc44c0db56e84ef6aa244a88427d2efe06cd h: refs/heads/master i:   101975:
 ca37b7b0993b709418728ee677e9d446df7f2ff4 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/blkdev.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ad422f38352..219d2597ae08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df1b049bc86495a40e421abc8b9cf1dda32f0d9
+refs/heads/master: d442cc44c0db56e84ef6aa244a88427d2efe06cd
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 32a441b05fd5..88d68081a0f1 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -985,6 +985,9 @@ static inline int bdev_integrity_enabled(struct block_device *bdev, int rw)
 
 static inline int blk_integrity_rq(struct request *rq)
 {
+	if (rq->bio == NULL)
+		return 0;
+
 	return bio_integrity(rq->bio);
 }