aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kernfs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-12-11 14:11:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-11 20:39:20 -0500
commitc525aaddc366df23eb095d58a2bdf11cce62a98b (patch)
tree4f1e5e85e619e46daef45537bd5926925587b463 /include/linux/kernfs.h
parentadc5e8b58f4886d45f79f4ff41a09001a76a6b12 (diff)
kernfs: s/sysfs/kernfs/ in various data structures
kernfs has just been separated out from sysfs and we're already in full conflict mode. Nothing can make the situation any worse. Let's take the chance to name things properly. This patch performs the following renames. * s/sysfs_open_dirent/kernfs_open_node/ * s/sysfs_open_file/kernfs_open_file/ * s/sysfs_inode_attrs/kernfs_iattrs/ * s/sysfs_addrm_cxt/kernfs_addrm_cxt/ * s/sysfs_super_info/kernfs_super_info/ * s/sysfs_info()/kernfs_info()/ * s/sysfs_open_dirent_lock/kernfs_open_node_lock/ * s/sysfs_open_file_mutex/kernfs_open_file_mutex/ * s/sysfs_of()/kernfs_of()/ This patch is strictly rename only and doesn't introduce any functional difference. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/kernfs.h')
-rw-r--r--include/linux/kernfs.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 092469f60e3e..757647c4cb3b 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -24,8 +24,8 @@ struct vm_area_struct;
24struct super_block; 24struct super_block;
25struct file_system_type; 25struct file_system_type;
26 26
27struct sysfs_open_dirent; 27struct kernfs_open_node;
28struct sysfs_inode_attrs; 28struct kernfs_iattrs;
29 29
30enum kernfs_node_type { 30enum kernfs_node_type {
31 SYSFS_DIR = 0x0001, 31 SYSFS_DIR = 0x0001,
@@ -65,7 +65,7 @@ struct kernfs_elem_symlink {
65 65
66struct kernfs_elem_attr { 66struct kernfs_elem_attr {
67 const struct kernfs_ops *ops; 67 const struct kernfs_ops *ops;
68 struct sysfs_open_dirent *open; 68 struct kernfs_open_node *open;
69 loff_t size; 69 loff_t size;
70}; 70};
71 71
@@ -108,7 +108,7 @@ struct kernfs_node {
108 unsigned short flags; 108 unsigned short flags;
109 umode_t mode; 109 umode_t mode;
110 unsigned int ino; 110 unsigned int ino;
111 struct sysfs_inode_attrs *iattr; 111 struct kernfs_iattrs *iattr;
112}; 112};
113 113
114struct kernfs_root { 114struct kernfs_root {
@@ -119,7 +119,7 @@ struct kernfs_root {
119 struct ida ino_ida; 119 struct ida ino_ida;
120}; 120};
121 121
122struct sysfs_open_file { 122struct kernfs_open_file {
123 /* published fields */ 123 /* published fields */
124 struct kernfs_node *kn; 124 struct kernfs_node *kn;
125 struct file *file; 125 struct file *file;
@@ -140,7 +140,7 @@ struct kernfs_ops {
140 * If seq_show() is present, seq_file path is active. Other seq 140 * If seq_show() is present, seq_file path is active. Other seq
141 * operations are optional and if not implemented, the behavior is 141 * operations are optional and if not implemented, the behavior is
142 * equivalent to single_open(). @sf->private points to the 142 * equivalent to single_open(). @sf->private points to the
143 * associated sysfs_open_file. 143 * associated kernfs_open_file.
144 * 144 *
145 * read() is bounced through kernel buffer and a read larger than 145 * read() is bounced through kernel buffer and a read larger than
146 * PAGE_SIZE results in partial operation of PAGE_SIZE. 146 * PAGE_SIZE results in partial operation of PAGE_SIZE.
@@ -151,17 +151,17 @@ struct kernfs_ops {
151 void *(*seq_next)(struct seq_file *sf, void *v, loff_t *ppos); 151 void *(*seq_next)(struct seq_file *sf, void *v, loff_t *ppos);
152 void (*seq_stop)(struct seq_file *sf, void *v); 152 void (*seq_stop)(struct seq_file *sf, void *v);
153 153
154 ssize_t (*read)(struct sysfs_open_file *of, char *buf, size_t bytes, 154 ssize_t (*read)(struct kernfs_open_file *of, char *buf, size_t bytes,
155 loff_t off); 155 loff_t off);
156 156
157 /* 157 /*
158 * write() is bounced through kernel buffer and a write larger than 158 * write() is bounced through kernel buffer and a write larger than
159 * PAGE_SIZE results in partial operation of PAGE_SIZE. 159 * PAGE_SIZE results in partial operation of PAGE_SIZE.
160 */ 160 */
161 ssize_t (*write)(struct sysfs_open_file *of, char *buf, size_t bytes, 161 ssize_t (*write)(struct kernfs_open_file *of, char *buf, size_t bytes,
162 loff_t off); 162 loff_t off);
163 163
164 int (*mmap)(struct sysfs_open_file *of, struct vm_area_struct *vma); 164 int (*mmap)(struct kernfs_open_file *of, struct vm_area_struct *vma);
165 165
166#ifdef CONFIG_DEBUG_LOCK_ALLOC 166#ifdef CONFIG_DEBUG_LOCK_ALLOC
167 struct lock_class_key lockdep_key; 167 struct lock_class_key lockdep_key;