summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-05-17 03:07:00 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-05-17 07:24:37 -0400
commit426e88e41cdcecd007a689daf4fe432bb61303ec (patch)
tree55f5588404d1e7a00035f80b51c37d11df44e711
parent84e8950cc70915ce8c04d4434909bb9e666e2ba3 (diff)
Update bcachefs sources to f65603966f bcachefs: drop old includes
-rw-r--r--.bcachefs_revision2
-rw-r--r--libbcachefs/bcachefs.h4
-rw-r--r--libbcachefs/btree_types.h2
-rw-r--r--libbcachefs/error.h1
-rw-r--r--libbcachefs/io.h1
5 files changed, 2 insertions, 8 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision
index e267faa6..e40e21f8 100644
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-0906b1fb492e8e84f563b192fd8f458af1c1d420
+f65603966f7474213e6bf22b046e374d01fd6639
diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index 879bde20..4219c46c 100644
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -186,8 +186,6 @@
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/percpu-refcount.h>
-#include <linux/radix-tree.h>
-#include <linux/rbtree.h>
#include <linux/rhashtable.h>
#include <linux/rwsem.h>
#include <linux/seqlock.h>
@@ -321,8 +319,6 @@ enum bch_time_stats {
#define BTREE_NODE_RESERVE (BTREE_RESERVE_MAX * 4)
struct btree;
-struct crypto_blkcipher;
-struct crypto_ahash;
enum gc_phase {
GC_PHASE_SB = BTREE_ID_NR + 1,
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index f62c96d9..aed8d693 100644
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -3,8 +3,6 @@
#include <linux/list.h>
#include <linux/rhashtable.h>
-#include <linux/semaphore.h>
-#include <linux/workqueue.h>
#include "bkey_methods.h"
#include "journal_types.h"
diff --git a/libbcachefs/error.h b/libbcachefs/error.h
index ababaee0..f65ef132 100644
--- a/libbcachefs/error.h
+++ b/libbcachefs/error.h
@@ -1,6 +1,7 @@
#ifndef _BCACHEFS_ERROR_H
#define _BCACHEFS_ERROR_H
+#include <linux/list.h>
#include <linux/printk.h>
struct bch_dev;
diff --git a/libbcachefs/io.h b/libbcachefs/io.h
index 8b1411c6..68539c78 100644
--- a/libbcachefs/io.h
+++ b/libbcachefs/io.h
@@ -1,7 +1,6 @@
#ifndef _BCACHEFS_IO_H
#define _BCACHEFS_IO_H
-#include <linux/hash.h>
#include "alloc.h"
#include "checksum.h"
#include "io_types.h"