---

yaml --- r: 101977 b: refs/heads/master c: d442cc4 h: refs/heads/master i: 101975: ca37b7b v: v3
git-mirror · Jul 16, 2008 · 0f21a46 · 0f21a46
1 parent f85b689
commit 0f21a46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }