diff options
| author | Tejun Heo <tj@kernel.org> | 2013-11-28 14:54:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 17:35:05 -0800 |
| commit | c6fb449515f23edea828fb90a460d3622e261dba (patch) | |
| tree | 033c7d86147c0773f06854e40f76feae8df3c22e /fs/sysfs/file.c | |
| parent | fdbffaa478fc77e999cbe2ac0dcfbf609103e675 (diff) | |
| download | linux-c6fb449515f23edea828fb90a460d3622e261dba.tar.gz linux-c6fb449515f23edea828fb90a460d3622e261dba.tar.bz2 linux-c6fb449515f23edea828fb90a460d3622e261dba.zip | |
sysfs, kernfs: prepare open, release, poll paths for kernfs
We're in the process of separating out core sysfs functionality into
kernfs which will deal with sysfs_dirents directly. This patch
prepares the rest - open, release and poll. There isn't much to do.
Just renaming is enough. As sysfs_file_operations and
sysfs_bin_operations are identical now, use the same file_operations
for both - kernfs_file_operations.
This patch doesn't introduce any behavior changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs/file.c')
| -rw-r--r-- | fs/sysfs/file.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 2e24e89bd92b..a43df04c81f9 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -668,7 +668,7 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd, kfree(od); } -static int sysfs_open_file(struct inode *inode, struct file *file) +static int kernfs_file_open(struct inode *inode, struct file *file) { struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata; struct kobject *kobj = attr_sd->s_parent->priv; @@ -771,7 +771,7 @@ err_out: return error; } -static int sysfs_release(struct inode *inode, struct file *filp) +static int kernfs_file_release(struct inode *inode, struct file *filp) { struct sysfs_dirent *sd = filp->f_path.dentry->d_fsdata; struct sysfs_open_file *of = sysfs_of(filp); @@ -822,7 +822,7 @@ void sysfs_unmap_bin_file(struct sysfs_dirent *sd) * to see if it supports poll (Neither 'poll' nor 'select' return * an appropriate error code). When in doubt, set a suitable timeout value. */ -static unsigned int sysfs_poll(struct file *filp, poll_table *wait) +static unsigned int kernfs_file_poll(struct file *filp, poll_table *wait) { struct sysfs_open_file *of = sysfs_of(filp); struct sysfs_dirent *attr_sd = filp->f_path.dentry->d_fsdata; @@ -881,24 +881,14 @@ void sysfs_notify(struct kobject *k, const char *dir, const char *attr) } EXPORT_SYMBOL_GPL(sysfs_notify); -const struct file_operations sysfs_file_operations = { +const struct file_operations kernfs_file_operations = { .read = kernfs_file_read, .write = kernfs_file_write, .llseek = generic_file_llseek, .mmap = kernfs_file_mmap, - .open = sysfs_open_file, - .release = sysfs_release, - .poll = sysfs_poll, -}; - -const struct file_operations sysfs_bin_operations = { - .read = kernfs_file_read, - .write = kernfs_file_write, - .llseek = generic_file_llseek, - .mmap = kernfs_file_mmap, - .open = sysfs_open_file, - .release = sysfs_release, - .poll = sysfs_poll, + .open = kernfs_file_open, + .release = kernfs_file_release, + .poll = kernfs_file_poll, }; int sysfs_add_file_mode_ns(struct sysfs_dirent *dir_sd, |