Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull more block fixes from Jens Axboe:
 "As mentioned in the pull the other day, a few more fixes for this
  round, all related to the bio op changes in this series.

  Two fixes, and then a cleanup, renaming bio->bi_rw to bio->bi_opf.  I
  wanted to do that change right after or right before -rc1, so that
  risk of conflict was reduced.  I just rebased the series on top of
  current master, and no new ->bi_rw usage has snuck in"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: rename bio bi_rw to bi_opf
  target: iblock_execute_sync_cache() should use bio_set_op_attrs()
  mm: make __swap_writepage() use bio_set_op_attrs()
  block/mm: make bdev_ops->rw_page() take a bool for read/write

8 files changed, 37 insertions, 37 deletions

diff --git a/include/linux/bio.h b/include/linux/bio.h
index e09a8895fc31..59ffaa68b11b 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -95,7 +95,7 @@ static inline bool bio_is_rw(struct bio *bio)
 
 static inline bool bio_mergeable(struct bio *bio)
 {
-        if (bio->bi_rw & REQ_NOMERGE_FLAGS)
+        if (bio->bi_opf & REQ_NOMERGE_FLAGS)
                 return false;
 
         return true;
@@ -318,7 +318,7 @@ struct bio_integrity_payload {
 
 static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
 {
-        if (bio->bi_rw & REQ_INTEGRITY)
+        if (bio->bi_opf & REQ_INTEGRITY)
                 return bio->bi_integrity;
 
         return NULL;
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index f77150a4a96a..10648e300c93 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -714,9 +714,9 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q,
 
         if (!throtl) {
                 blkg = blkg ?: q->root_blkg;
-                blkg_rwstat_add(&blkg->stat_bytes, bio_op(bio), bio->bi_rw,
+                blkg_rwstat_add(&blkg->stat_bytes, bio_op(bio), bio->bi_opf,
                                 bio->bi_iter.bi_size);
-                blkg_rwstat_add(&blkg->stat_ios, bio_op(bio), bio->bi_rw, 1);
+                blkg_rwstat_add(&blkg->stat_ios, bio_op(bio), bio->bi_opf, 1);
         }
 
         rcu_read_unlock();
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 14b28ff2caf8..436f43f87da9 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -18,17 +18,6 @@ struct cgroup_subsys_state;
 typedef void (bio_end_io_t) (struct bio *);
 typedef void (bio_destructor_t) (struct bio *);
 
-enum req_op {
-        REQ_OP_READ,
-        REQ_OP_WRITE,
-        REQ_OP_DISCARD,         /* request to discard sectors */
-        REQ_OP_SECURE_ERASE,    /* request to securely erase sectors */
-        REQ_OP_WRITE_SAME,      /* write same block many times */
-        REQ_OP_FLUSH,           /* request for cache flush */
-};
-
-#define REQ_OP_BITS 3
-
 #ifdef CONFIG_BLOCK
 /*
  * main unit of I/O for the block layer and lower layers (ie drivers and
@@ -38,8 +27,9 @@ struct bio {
         struct bio              *bi_next;       /* request queue link */
         struct block_device     *bi_bdev;
         int                     bi_error;
-        unsigned int            bi_rw;          /* bottom bits req flags,
-                                                 * top bits REQ_OP
+        unsigned int            bi_opf;         /* bottom bits req flags,
+                                                 * top bits REQ_OP. Use
+                                                 * accessors.
                                                  */
         unsigned short          bi_flags;       /* status, command, etc */
         unsigned short          bi_ioprio;
@@ -100,13 +90,13 @@ struct bio {
 };
 
 #define BIO_OP_SHIFT    (8 * sizeof(unsigned int) - REQ_OP_BITS)
-#define bio_op(bio)     ((bio)->bi_rw >> BIO_OP_SHIFT)
+#define bio_op(bio)     ((bio)->bi_opf >> BIO_OP_SHIFT)
 
 #define bio_set_op_attrs(bio, op, op_flags) do {                \
         WARN_ON(op >= (1 << REQ_OP_BITS));                      \
-        (bio)->bi_rw &= ((1 << BIO_OP_SHIFT) - 1);              \
-        (bio)->bi_rw |= ((unsigned int) (op) << BIO_OP_SHIFT);  \
-        (bio)->bi_rw |= op_flags;                               \
+        (bio)->bi_opf &= ((1 << BIO_OP_SHIFT) - 1);             \
+        (bio)->bi_opf |= ((unsigned int) (op) << BIO_OP_SHIFT); \
+        (bio)->bi_opf |= op_flags;                              \
 } while (0)
 
 #define BIO_RESET_BYTES         offsetof(struct bio, bi_max_vecs)
@@ -149,7 +139,7 @@ struct bio {
 
 /*
  * Request flags.  For use in the cmd_flags field of struct request, and in
- * bi_rw of struct bio.  Note that some flags are only valid in either one.
+ * bi_opf of struct bio.  Note that some flags are only valid in either one.
  */
 enum rq_flag_bits {
         /* common flags */
@@ -239,6 +229,17 @@ enum rq_flag_bits {
 #define REQ_HASHED              (1ULL << __REQ_HASHED)
 #define REQ_MQ_INFLIGHT         (1ULL << __REQ_MQ_INFLIGHT)
 
+enum req_op {
+        REQ_OP_READ,
+        REQ_OP_WRITE,
+        REQ_OP_DISCARD,         /* request to discard sectors */
+        REQ_OP_SECURE_ERASE,    /* request to securely erase sectors */
+        REQ_OP_WRITE_SAME,      /* write same block many times */
+        REQ_OP_FLUSH,           /* request for cache flush */
+};
+
+#define REQ_OP_BITS 3
+
 typedef unsigned int blk_qc_t;
 #define BLK_QC_T_NONE   -1U
 #define BLK_QC_T_SHIFT  16
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ccd68c0d01de..2c210b6a7bcf 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1672,7 +1672,7 @@ struct blk_dax_ctl {
 struct block_device_operations {
         int (*open) (struct block_device *, fmode_t);
         void (*release) (struct gendisk *, fmode_t);
-        int (*rw_page)(struct block_device *, sector_t, struct page *, int op);
+        int (*rw_page)(struct block_device *, sector_t, struct page *, bool);
         int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
         int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
         long (*direct_access)(struct block_device *, sector_t, void **, pfn_t *,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 33f0e96db06f..3523bf62f328 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2480,13 +2480,12 @@ extern void init_special_inode(struct inode *, umode_t, dev_t);
 extern void make_bad_inode(struct inode *);
 extern bool is_bad_inode(struct inode *);
 
+#ifdef CONFIG_BLOCK
 static inline bool op_is_write(unsigned int op)
 {
         return op == REQ_OP_READ ? false : true;
 }
 
-#ifdef CONFIG_BLOCK
-
 /*
  * return data direction, READ or WRITE
  */
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 45786374abbd..66a1260b33de 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -510,7 +510,7 @@ static inline void wait_on_page_writeback(struct page *page)
 extern void end_page_writeback(struct page *page);
 void wait_for_stable_page(struct page *page);
 
-void page_endio(struct page *page, int op, int err);
+void page_endio(struct page *page, bool is_write, int err);
 
 /*
  * Add an arbitrary waiter to a page's wait queue
diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index 65673d8b81ac..d336b890e31f 100644
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -27,7 +27,7 @@ DECLARE_EVENT_CLASS(bcache_request,
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->orig_sector    = bio->bi_iter.bi_sector - 16;
                 __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
         ),
 
@@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
         ),
 
@@ -138,7 +138,7 @@ TRACE_EVENT(bcache_read,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 __entry->cache_hit = hit;
                 __entry->bypass = bypass;
@@ -170,7 +170,7 @@ TRACE_EVENT(bcache_write,
                 __entry->inode          = inode;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 __entry->writeback = writeback;
                 __entry->bypass = bypass;
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 5a2a7592068f..8f3a163b8166 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -274,7 +274,7 @@ TRACE_EVENT(block_bio_bounce,
                                           bio->bi_bdev->bd_dev : 0;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
@@ -313,7 +313,7 @@ TRACE_EVENT(block_bio_complete,
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
                 __entry->error          = error;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
         ),
 
@@ -341,7 +341,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
@@ -409,7 +409,7 @@ TRACE_EVENT(block_bio_queue,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
@@ -439,7 +439,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
                 __entry->sector         = bio ? bio->bi_iter.bi_sector : 0;
                 __entry->nr_sector      = bio ? bio_sectors(bio) : 0;
                 blk_fill_rwbs(__entry->rwbs, bio ? bio_op(bio) : 0,
-                              bio ? bio->bi_rw : 0, __entry->nr_sector);
+                              bio ? bio->bi_opf : 0, __entry->nr_sector);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
 
@@ -573,7 +573,7 @@ TRACE_EVENT(block_split,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->new_sector     = new_sector;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
@@ -617,7 +617,7 @@ TRACE_EVENT(block_bio_remap,
                 __entry->nr_sector      = bio_sectors(bio);
                 __entry->old_dev        = dev;
                 __entry->old_sector     = from;
-                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_rw,
+                blk_fill_rwbs(__entry->rwbs, bio_op(bio), bio->bi_opf,
                               bio->bi_iter.bi_size);
         ),