summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 19:54:20 (GMT)
committerPawel Osmialowski <p.osmialowsk@mcdsrvbld02.digital.local>2015-03-27 13:37:28 (GMT)
commit0fa1c8df47d417ba8f535b3ac56f201fe83df0b7 (patch)
tree3afa0bb5383e935635ef9523180bc1cb99c33ddf
parentf1fe8ab7263237fbcc89b3bbd072385dc6947382 (diff)
downloadlinux-3.10-0fa1c8df47d417ba8f535b3ac56f201fe83df0b7.zip
linux-3.10-0fa1c8df47d417ba8f535b3ac56f201fe83df0b7.tar.gz
linux-3.10-0fa1c8df47d417ba8f535b3ac56f201fe83df0b7.tar.bz2
sysfs, kernfs: move sysfs_open_file to include/linux/kernfs.h
sysfs_open_file will be used as the primary handle for kernfs methods. Move its definition from fs/sysfs/file.c to include/linux/kernfs.h and mark the public and private fields. This is pure relocation. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/sysfs/file.c11
-rw-r--r--include/linux/kernfs.h18
2 files changed, 18 insertions, 11 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 68cd32b..a3a705e 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -47,17 +47,6 @@ struct sysfs_open_dirent {
struct list_head files; /* goes through sysfs_open_file.list */
};
-struct sysfs_open_file {
- struct sysfs_dirent *sd;
- struct file *file;
- struct mutex mutex;
- int event;
- struct list_head list;
-
- bool mmapped;
- const struct vm_operations_struct *vm_ops;
-};
-
static bool sysfs_is_bin(struct sysfs_dirent *sd)
{
return sysfs_type(sd) == SYSFS_KOBJ_BIN_ATTR;
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index e8b73d4..b923052 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -9,12 +9,30 @@
#include <linux/kernel.h>
#include <linux/err.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
struct file;
struct iattr;
+struct seq_file;
+struct vm_area_struct;
struct sysfs_dirent;
+struct sysfs_open_file {
+ /* published fields */
+ struct sysfs_dirent *sd;
+ struct file *file;
+
+ /* private fields, do not use outside kernfs proper */
+ struct mutex mutex;
+ int event;
+ struct list_head list;
+
+ bool mmapped;
+ const struct vm_operations_struct *vm_ops;
+};
+
#ifdef CONFIG_SYSFS
struct sysfs_dirent *kernfs_create_dir_ns(struct sysfs_dirent *parent,