diff options
author | Tejun Heo <tj@kernel.org> | 2013-11-28 14:54:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 21:54:50 -0500 |
commit | bfc5c17337145955b31c22b96a6e07def048471b (patch) | |
tree | b6c665ed20a1df8553704361944bdc16f8191379 /fs | |
parent | ac9bba031001704a2339713cc12148857eccc5e5 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/kernfs/kernfs-internal.h | 2 | ||||
-rw-r--r-- | fs/sysfs/sysfs.h | 1 |
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 { | |||
48 | struct sysfs_dirent *removed; | 48 | struct sysfs_dirent *removed; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | #include "../sysfs/sysfs.h" | ||
52 | |||
53 | /* | 51 | /* |
54 | * mount.c | 52 | * mount.c |
55 | */ | 53 | */ |
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 @@ | |||
11 | #ifndef __SYSFS_INTERNAL_H | 11 | #ifndef __SYSFS_INTERNAL_H |
12 | #define __SYSFS_INTERNAL_H | 12 | #define __SYSFS_INTERNAL_H |
13 | 13 | ||
14 | #include "../kernfs/kernfs-internal.h" | ||
15 | #include <linux/sysfs.h> | 14 | #include <linux/sysfs.h> |
16 | 15 | ||
17 | /* | 16 | /* |