summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 14:54:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 18:54:50 -0800
commitbfc5c17337145955b31c22b96a6e07def048471b (patch)
treeb6c665ed20a1df8553704361944bdc16f8191379
parentac9bba031001704a2339713cc12148857eccc5e5 (diff)
downloadlinux-bfc5c17337145955b31c22b96a6e07def048471b.tar.gz
linux-bfc5c17337145955b31c22b96a6e07def048471b.tar.bz2
linux-bfc5c17337145955b31c22b96a6e07def048471b.zip
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 f33a7844e8fd..d1ff591c5cf3 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 6a82311a50fe..c8e395b49330 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>
/*