diff options
author | David Sterba <dsterba@suse.com> | 2019-08-01 13:46:20 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2019-09-09 08:59:07 -0400 |
commit | 67715b206c397b28b8a41c9ddbdc1776a0e7a25f (patch) | |
tree | f618dfc5072036e488209dbd2b4f3b0f90f033d0 | |
parent | f93c39970b1da007b3110fd7c9dd361614922457 (diff) |
btrfs: cleanup kobject.h includes
The kobject should be pulled in via sysfs.h and that needs to include it
because it needs various definitions like kobj_attribute or kobject.
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/ctree.h | 1 | ||||
-rw-r--r-- | fs/btrfs/sysfs.c | 1 | ||||
-rw-r--r-- | fs/btrfs/sysfs.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index c40f28f175c8..fc5031e6fd23 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/backing-dev.h> | 16 | #include <linux/backing-dev.h> |
17 | #include <linux/wait.h> | 17 | #include <linux/wait.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/kobject.h> | ||
20 | #include <trace/events/btrfs.h> | 19 | #include <trace/events/btrfs.h> |
21 | #include <asm/kmap_types.h> | 20 | #include <asm/kmap_types.h> |
22 | #include <asm/unaligned.h> | 21 | #include <asm/unaligned.h> |
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 9078e377ba7b..85cf3bfc9f62 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
9 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
10 | #include <linux/completion.h> | 10 | #include <linux/completion.h> |
11 | #include <linux/kobject.h> | ||
12 | #include <linux/bug.h> | 11 | #include <linux/bug.h> |
13 | 12 | ||
14 | #include "ctree.h" | 13 | #include "ctree.h" |
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index 4243fcf607b0..611e103c174b 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h | |||
@@ -3,6 +3,8 @@ | |||
3 | #ifndef BTRFS_SYSFS_H | 3 | #ifndef BTRFS_SYSFS_H |
4 | #define BTRFS_SYSFS_H | 4 | #define BTRFS_SYSFS_H |
5 | 5 | ||
6 | #include <linux/kobject.h> | ||
7 | |||
6 | enum btrfs_feature_set { | 8 | enum btrfs_feature_set { |
7 | FEAT_COMPAT, | 9 | FEAT_COMPAT, |
8 | FEAT_COMPAT_RO, | 10 | FEAT_COMPAT_RO, |