1 files changed, 30 insertions, 41 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 87be398166d3..0207a78a8d82 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -36,6 +36,7 @@ struct request;
 struct sg_io_hdr;
 struct bsg_job;
 struct blkcg_gq;
+struct blk_flush_queue;
 
 #define BLKDEV_MIN_RQ   4
 #define BLKDEV_MAX_RQ   128     /* Default maximum */
@@ -455,14 +456,7 @@ struct request_queue {
          */
         unsigned int            flush_flags;
         unsigned int            flush_not_queueable:1;
-        unsigned int            flush_queue_delayed:1;
-        unsigned int            flush_pending_idx:1;
-        unsigned int            flush_running_idx:1;
-        unsigned long           flush_pending_since;
-        struct list_head        flush_queue[2];
-        struct list_head        flush_data_in_flight;
-        struct request          *flush_rq;
-        spinlock_t              mq_flush_lock;
+        struct blk_flush_queue  *fq;
 
         struct list_head        requeue_list;
         spinlock_t              requeue_lock;
@@ -865,7 +859,7 @@ extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,
 
 static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
 {
-        return bdev->bd_disk->queue;
+        return bdev->bd_disk->queue;    /* this is never NULL */
 }
 
 /*
@@ -1285,10 +1279,9 @@ static inline int queue_alignment_offset(struct request_queue *q)
 static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
 {
         unsigned int granularity = max(lim->physical_block_size, lim->io_min);
-        unsigned int alignment = (sector << 9) & (granularity - 1);
+        unsigned int alignment = sector_div(sector, granularity >> 9) << 9;
 
-        return (granularity + lim->alignment_offset - alignment)
-                & (granularity - 1);
+        return (granularity + lim->alignment_offset - alignment) % granularity;
 }
 
 static inline int bdev_alignment_offset(struct block_device *bdev)
@@ -1464,32 +1457,31 @@ static inline uint64_t rq_io_start_time_ns(struct request *req)
 
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
 
-#define INTEGRITY_FLAG_READ     2       /* verify data integrity on read */
-#define INTEGRITY_FLAG_WRITE    4       /* generate data integrity on write */
+enum blk_integrity_flags {
+        BLK_INTEGRITY_VERIFY            = 1 << 0,
+        BLK_INTEGRITY_GENERATE          = 1 << 1,
+        BLK_INTEGRITY_DEVICE_CAPABLE    = 1 << 2,
+        BLK_INTEGRITY_IP_CHECKSUM       = 1 << 3,
+};
 
-struct blk_integrity_exchg {
+struct blk_integrity_iter {
         void                    *prot_buf;
         void                    *data_buf;
-        sector_t                sector;
+        sector_t                seed;
         unsigned int            data_size;
-        unsigned short          sector_size;
+        unsigned short          interval;
         const char              *disk_name;
 };
 
-typedef void (integrity_gen_fn) (struct blk_integrity_exchg *);
-typedef int (integrity_vrfy_fn) (struct blk_integrity_exchg *);
-typedef void (integrity_set_tag_fn) (void *, void *, unsigned int);
-typedef void (integrity_get_tag_fn) (void *, void *, unsigned int);
+typedef int (integrity_processing_fn) (struct blk_integrity_iter *);
 
 struct blk_integrity {
-        integrity_gen_fn        *generate_fn;
-        integrity_vrfy_fn       *verify_fn;
-        integrity_set_tag_fn    *set_tag_fn;
-        integrity_get_tag_fn    *get_tag_fn;
+        integrity_processing_fn *generate_fn;
+        integrity_processing_fn *verify_fn;
 
         unsigned short          flags;
         unsigned short          tuple_size;
-        unsigned short          sector_size;
+        unsigned short          interval;
         unsigned short          tag_size;
 
         const char              *name;
@@ -1504,10 +1496,10 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *);
 extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *,
                                    struct scatterlist *);
 extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *);
-extern int blk_integrity_merge_rq(struct request_queue *, struct request *,
-                                  struct request *);
-extern int blk_integrity_merge_bio(struct request_queue *, struct request *,
-                                   struct bio *);
+extern bool blk_integrity_merge_rq(struct request_queue *, struct request *,
+                                   struct request *);
+extern bool blk_integrity_merge_bio(struct request_queue *, struct request *,
+                                    struct bio *);
 
 static inline
 struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
@@ -1520,12 +1512,9 @@ static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
         return disk->integrity;
 }
 
-static inline int blk_integrity_rq(struct request *rq)
+static inline bool blk_integrity_rq(struct request *rq)
 {
-        if (rq->bio == NULL)
-                return 0;
-
-        return bio_integrity(rq->bio);
+        return rq->cmd_flags & REQ_INTEGRITY;
 }
 
 static inline void blk_queue_max_integrity_segments(struct request_queue *q,
@@ -1590,15 +1579,15 @@ static inline unsigned short queue_max_integrity_segments(struct request_queue *
 {
         return 0;
 }
-static inline int blk_integrity_merge_rq(struct request_queue *rq,
-                                         struct request *r1,
-                                         struct request *r2)
+static inline bool blk_integrity_merge_rq(struct request_queue *rq,
+                                          struct request *r1,
+                                          struct request *r2)
 {
         return 0;
 }
-static inline int blk_integrity_merge_bio(struct request_queue *rq,
-                                          struct request *r,
-                                          struct bio *b)
+static inline bool blk_integrity_merge_bio(struct request_queue *rq,
+                                           struct request *r,
+                                           struct bio *b)
 {
         return 0;
 }