From: David Sterba <dsterba@suse.com>
Date: Thu, 1 Aug 2019 17:46:20 +0000 (+0200)
Subject: btrfs: cleanup kobject.h includes
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~2033^2~77
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=67715b206c397b28b8a41c9ddbdc1776a0e7a25f;p=mirror_ubuntu-focal-kernel.git

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>
---

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 @@
 #include <linux/backing-dev.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
-#include <linux/kobject.h>
 #include <trace/events/btrfs.h>
 #include <asm/kmap_types.h>
 #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 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
-#include <linux/kobject.h>
 #include <linux/bug.h>
 
 #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 @@
 #ifndef BTRFS_SYSFS_H
 #define BTRFS_SYSFS_H
 
+#include <linux/kobject.h>
+
 enum btrfs_feature_set {
 	FEAT_COMPAT,
 	FEAT_COMPAT_RO,