On Tue, Jun 23, 2015 at 02:32:54PM +0100, Richard Fitzgerald wrote: > The file read/write functions for bools have no special dependencies > on debugfs internals and are sufficiently non-trivial to be worth > exporting so clients can re-use the implementation.
Greg, I'm assuming you're OK with this? Please shout if not.
> Signed-off-by: Richard Fitzgerald <r...@opensource.wolfsonmicro.com>
> ---
> fs/debugfs/file.c | 14 ++++++++------
> include/linux/debugfs.h | 20 ++++++++++++++++++++
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
> index 830a7e7..95ae5ee 100644
> --- a/fs/debugfs/file.c
> +++ b/fs/debugfs/file.c
> @@ -447,8 +447,8 @@ struct dentry *debugfs_create_atomic_t(const char *name,
> umode_t mode,
> }
> EXPORT_SYMBOL_GPL(debugfs_create_atomic_t);
>
> -static ssize_t read_file_bool(struct file *file, char __user *user_buf,
> - size_t count, loff_t *ppos)
> +ssize_t debugfs_read_file_bool(struct file *file, char __user *user_buf,
> + size_t count, loff_t *ppos)
> {
> char buf[3];
> u32 *val = file->private_data;
> @@ -461,9 +461,10 @@ static ssize_t read_file_bool(struct file *file, char
> __user *user_buf,
> buf[2] = 0x00;
> return simple_read_from_buffer(user_buf, count, ppos, buf, 2);
> }
> +EXPORT_SYMBOL_GPL(debugfs_read_file_bool);
>
> -static ssize_t write_file_bool(struct file *file, const char __user
> *user_buf,
> - size_t count, loff_t *ppos)
> +ssize_t debugfs_write_file_bool(struct file *file, const char __user
> *user_buf,
> + size_t count, loff_t *ppos)
> {
> char buf[32];
> size_t buf_size;
> @@ -480,10 +481,11 @@ static ssize_t write_file_bool(struct file *file, const
> char __user *user_buf,
>
> return count;
> }
> +EXPORT_SYMBOL_GPL(debugfs_write_file_bool);
>
> static const struct file_operations fops_bool = {
> - .read = read_file_bool,
> - .write = write_file_bool,
> + .read = debugfs_read_file_bool,
> + .write = debugfs_write_file_bool,
> .open = simple_open,
> .llseek = default_llseek,
> };
> diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
> index cb25af4..1545962 100644
> --- a/include/linux/debugfs.h
> +++ b/include/linux/debugfs.h
> @@ -117,6 +117,12 @@ struct dentry *debugfs_create_devm_seqfile(struct device
> *dev, const char *name,
>
> bool debugfs_initialized(void);
>
> +ssize_t debugfs_read_file_bool(struct file *file, char __user *user_buf,
> + size_t count, loff_t *ppos);
> +
> +ssize_t debugfs_write_file_bool(struct file *file, const char __user
> *user_buf,
> + size_t count, loff_t *ppos);
> +
> #else
>
> #include <linux/err.h>
> @@ -283,6 +289,20 @@ static inline struct dentry
> *debugfs_create_devm_seqfile(struct device *dev,
> return ERR_PTR(-ENODEV);
> }
>
> +static inline ssize_t debugfs_read_file_bool(struct file *file,
> + char __user *user_buf,
> + size_t count, loff_t *ppos)
> +{
> + return -ENODEV;
> +}
> +
> +static inline ssize_t debugfs_write_file_bool(struct file *file,
> + const char __user *user_buf,
> + size_t count, loff_t *ppos)
> +{
> + return -ENODEV;
> +}
> +
> #endif
>
> #endif
> --
> 1.7.2.5
>
>
signature.asc
Description: Digital signature
