Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6

[cascardo/linux.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 32a441b..88d6808 100644 (file)
--- a/include/linux/blkdev.h
+++ b/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);
 }