summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 19:54:47 (GMT)
committerPawel Osmialowski <p.osmialowsk@mcdsrvbld02.digital.local>2015-03-27 13:37:33 (GMT)
commitb2ca68e90cd7cbc248c55726653a12cf6c02d86a (patch)
tree5d9a2d03e4da878b22171c5f5da8a0349b22274c
parenta837767f522c27fd12a15dec62e15dc6eabb4294 (diff)
downloadlinux-3.10-b2ca68e90cd7cbc248c55726653a12cf6c02d86a.zip
linux-3.10-b2ca68e90cd7cbc248c55726653a12cf6c02d86a.tar.gz
linux-3.10-b2ca68e90cd7cbc248c55726653a12cf6c02d86a.tar.bz2
sysfs, kernfs: remove cross inclusions of internal headers
fs/kernfs/kernfs-internal.h needed to include fs/sysfs/sysfs.h because part of kernfs core implementation was living in sysfs. fs/sysfs/sysfs.h needed to include fs/kernfs/kernfs-internal.h because include/linux/kernfs.h didn't expose enough interface. The separation is complete and neither is true anymore. Remove the cross inclusion and make sysfs a proper user of kernfs. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/kernfs/kernfs-internal.h2
-rw-r--r--fs/sysfs/sysfs.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h
index f33a784..d1ff591 100644
--- a/fs/kernfs/kernfs-internal.h
+++ b/fs/kernfs/kernfs-internal.h
@@ -48,8 +48,6 @@ struct sysfs_addrm_cxt {
struct sysfs_dirent *removed;
};
-#include "../sysfs/sysfs.h"
-
/*
* mount.c
*/
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 6a82311..c8e395b 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -11,7 +11,6 @@
#ifndef __SYSFS_INTERNAL_H
#define __SYSFS_INTERNAL_H
-#include "../kernfs/kernfs-internal.h"
#include <linux/sysfs.h>
/*