diff options
| -rw-r--r-- | fs/sysfs/file.c | 24 | ||||
| -rw-r--r-- | fs/sysfs/inode.c | 4 | ||||
| -rw-r--r-- | fs/sysfs/sysfs.h | 3 |
3 files changed, 10 insertions, 21 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 2e24e89bd92..a43df04c81f 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, diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 81cc8585b32..4c463dabfc6 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c @@ -272,12 +272,12 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode) break; case SYSFS_KOBJ_ATTR: inode->i_size = PAGE_SIZE; - inode->i_fop = &sysfs_file_operations; + inode->i_fop = &kernfs_file_operations; break; case SYSFS_KOBJ_BIN_ATTR: bin_attr = sd->priv; inode->i_size = bin_attr->size; - inode->i_fop = &sysfs_bin_operations; + inode->i_fop = &kernfs_file_operations; break; case SYSFS_KOBJ_LINK: inode->i_op = &sysfs_symlink_inode_operations; diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index 9ac234ef494..619250d2d7c 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -212,8 +212,7 @@ int sysfs_inode_init(void); /* * file.c */ -extern const struct file_operations sysfs_file_operations; -extern const struct file_operations sysfs_bin_operations; +extern const struct file_operations kernfs_file_operations; int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr, int type); |