summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 14:54:47 -0500
committerPawel Osmialowski <p.osmialowsk@mcdsrvbld02.digital.local>2015-03-27 18:13:19 +0100
commit08de0458716bb67d6db5d3046116694265427e35 (patch)
tree176b0ab84095482330a7017db342355b5cccf8ce
parent08807103786b0d0e56e6585d2c8a563463b51ed7 (diff)
downloadlinux-3.10-08de0458716bb67d6db5d3046116694265427e35.tar.gz
linux-3.10-08de0458716bb67d6db5d3046116694265427e35.tar.bz2
linux-3.10-08de0458716bb67d6db5d3046116694265427e35.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 f33a7844e8f..d1ff591c5cf 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 6a82311a50f..c8e395b4933 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>
/*