Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / md / bcache / request.h

diff --git a/drivers/md/bcache/request.h b/drivers/md/bcache/request.h
index 39f21dbedc38b43ec7bf4818cfca319d27d27433..1ff36875c2b30bcb29e650290b194c52cc57bc09 100644 (file)
--- a/drivers/md/bcache/request.h
+++ b/drivers/md/bcache/request.h
@@ -1,12 +1,11 @@
 #ifndef _BCACHE_REQUEST_H_
 #define _BCACHE_REQUEST_H_
 
-#include <linux/cgroup.h>
-
 struct data_insert_op {
        struct closure          cl;
        struct cache_set        *c;
        struct bio              *bio;
+       struct workqueue_struct *wq;
 
        unsigned                inode;
        uint16_t                write_point;
@@ -41,20 +40,4 @@ void bch_flash_dev_request_init(struct bcache_device *d);
 
 extern struct kmem_cache *bch_search_cache, *bch_passthrough_cache;
 
-struct bch_cgroup {
-#ifdef CONFIG_CGROUP_BCACHE
-       struct cgroup_subsys_state      css;
-#endif
-       /*
-        * We subtract one from the index into bch_cache_modes[], so that
-        * default == -1; this makes it so the rest match up with d->cache_mode,
-        * and we use d->cache_mode if cgrp->cache_mode < 0
-        */
-       short                           cache_mode;
-       bool                            verify;
-       struct cache_stat_collector     stats;
-};
-
-struct bch_cgroup *bch_bio_to_cgroup(struct bio *bio);
-
 #endif /* _BCACHE_REQUEST_H_ */