1 files changed, 18 insertions, 25 deletions

diff --git a/drivers/md/bcache/request.h b/drivers/md/bcache/request.h
index 57dc4784f4f4..2cd65bf073c2 100644
--- a/drivers/md/bcache/request.h
+++ b/drivers/md/bcache/request.h
@@ -3,40 +3,33 @@
 
 #include <linux/cgroup.h>
 
-struct search {
-        /* Stack frame for bio_complete */
+struct data_insert_op {
         struct closure          cl;
+        struct cache_set        *c;
+        struct bio              *bio;
 
-        struct bcache_device    *d;
-        struct task_struct      *task;
-
-        struct bbio             bio;
-        struct bio              *orig_bio;
-        struct bio              *cache_miss;
-        unsigned                cache_bio_sectors;
-
-        unsigned                recoverable:1;
-        unsigned                unaligned_bvec:1;
+        unsigned                inode;
+        uint16_t                write_point;
+        uint16_t                write_prio;
+        short                   error;
 
-        unsigned                write:1;
+        unsigned                bypass:1;
         unsigned                writeback:1;
+        unsigned                flush_journal:1;
+        unsigned                csum:1;
 
-        /* IO error returned to s->bio */
-        short                   error;
-        unsigned long           start_time;
+        unsigned                replace:1;
+        unsigned                replace_collision:1;
+
+        unsigned                insert_data_done:1;
 
-        /* Anything past op->keys won't get zeroed in do_bio_hook */
-        struct btree_op         op;
+        /* Anything past this point won't get zeroed in search_alloc() */
+        struct keylist          insert_keys;
+        BKEY_PADDED(replace_key);
 };
 
-void bch_cache_read_endio(struct bio *, int);
 unsigned bch_get_congested(struct cache_set *);
-void bch_insert_data(struct closure *cl);
-void bch_btree_insert_async(struct closure *);
-void bch_cache_read_endio(struct bio *, int);
-
-void bch_open_buckets_free(struct cache_set *);
-int bch_open_buckets_alloc(struct cache_set *);
+void bch_data_insert(struct closure *cl);
 
 void bch_cached_dev_request_init(struct cached_dev *dc);
 void bch_flash_dev_request_init(struct bcache_device *d);