aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 14:54:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 20:48:14 -0500
commitd19b9846df64d8845be682b6318bd1aee246cf60 (patch)
tree688842d196ae287bce080fe2e13ca00e796c8a06 /fs/sysfs
parent2d0cfbec2a95c16818960fda1dfa815fd1a62070 (diff)
sysfs, kernfs: add kernfs_ops->seq_{start|next|stop}()
kernfs_ops currently only supports single_open() behavior which is pretty restrictive. Add optional callbacks ->seq_{start|next|stop}() which, when implemented, are invoked for seq_file traversal. This allows full seq_file functionality for kernfs users. This currently doesn't have any user and doesn't change any behavior. v2: Refreshed on top of the updated "sysfs, kernfs: prepare read path for kernfs". Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/file.c39
1 files changed, 28 insertions, 11 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 9852450867cf..74e3478d9cb4 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -146,6 +146,7 @@ static ssize_t sysfs_kf_bin_read(struct sysfs_open_file *of, char *buf,
146static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos) 146static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)
147{ 147{
148 struct sysfs_open_file *of = sf->private; 148 struct sysfs_open_file *of = sf->private;
149 const struct kernfs_ops *ops;
149 150
150 /* 151 /*
151 * @of->mutex nests outside active ref and is just to ensure that 152 * @of->mutex nests outside active ref and is just to ensure that
@@ -155,26 +156,42 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)
155 if (!sysfs_get_active(of->sd)) 156 if (!sysfs_get_active(of->sd))
156 return ERR_PTR(-ENODEV); 157 return ERR_PTR(-ENODEV);
157 158
158 /* 159 ops = kernfs_ops(of->sd);
159 * The same behavior and code as single_open(). Returns !NULL if 160 if (ops->seq_start) {
160 * pos is at the beginning; otherwise, NULL. 161 return ops->seq_start(sf, ppos);
161 */ 162 } else {
162 return NULL + !*ppos; 163 /*
164 * The same behavior and code as single_open(). Returns
165 * !NULL if pos is at the beginning; otherwise, NULL.
166 */
167 return NULL + !*ppos;
168 }
163} 169}
164 170
165static void *kernfs_seq_next(struct seq_file *sf, void *v, loff_t *ppos) 171static void *kernfs_seq_next(struct seq_file *sf, void *v, loff_t *ppos)
166{ 172{
167 /* 173 struct sysfs_open_file *of = sf->private;
168 * The same behavior and code as single_open(), always terminate 174 const struct kernfs_ops *ops = kernfs_ops(of->sd);
169 * after the initial read. 175
170 */ 176 if (ops->seq_next) {
171 ++*ppos; 177 return ops->seq_next(sf, v, ppos);
172 return NULL; 178 } else {
179 /*
180 * The same behavior and code as single_open(), always
181 * terminate after the initial read.
182 */
183 ++*ppos;
184 return NULL;
185 }
173} 186}
174 187
175static void kernfs_seq_stop(struct seq_file *sf, void *v) 188static void kernfs_seq_stop(struct seq_file *sf, void *v)
176{ 189{
177 struct sysfs_open_file *of = sf->private; 190 struct sysfs_open_file *of = sf->private;
191 const struct kernfs_ops *ops = kernfs_ops(of->sd);
192
193 if (ops->seq_stop)
194 ops->seq_stop(sf, v);
178 195
179 sysfs_put_active(of->sd); 196 sysfs_put_active(of->sd);
180 mutex_unlock(&of->mutex); 197 mutex_unlock(&of->mutex);