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); }