From: Maneesh Soni o The following patch provides dumb helpers to access the corresponding kobject, attribute or binary attribute given a dentry and prepare the sysfs_file_operation methods for using sysfs_dirents. Signed-off-by: Andrew Morton --- 25-akpm/fs/sysfs/bin.c | 14 +++++++------- 25-akpm/fs/sysfs/file.c | 24 ++++++++++++------------ 25-akpm/fs/sysfs/sysfs.h | 18 +++++++++++++++++- 3 files changed, 36 insertions(+), 20 deletions(-) diff -puN fs/sysfs/bin.c~sysfs-backing-store-prepare-file_operations fs/sysfs/bin.c --- 25/fs/sysfs/bin.c~sysfs-backing-store-prepare-file_operations 2004-08-15 13:41:59.592063416 -0700 +++ 25-akpm/fs/sysfs/bin.c 2004-08-15 13:41:59.600062200 -0700 @@ -17,8 +17,8 @@ static int fill_read(struct dentry *dentry, char *buffer, loff_t off, size_t count) { - struct bin_attribute * attr = dentry->d_fsdata; - struct kobject * kobj = dentry->d_parent->d_fsdata; + struct bin_attribute * attr = to_bin_attr(dentry); + struct kobject * kobj = to_kobj(dentry->d_parent); return attr->read(kobj, buffer, off, count); } @@ -60,8 +60,8 @@ read(struct file * file, char __user * u static int flush_write(struct dentry *dentry, char *buffer, loff_t offset, size_t count) { - struct bin_attribute *attr = dentry->d_fsdata; - struct kobject *kobj = dentry->d_parent->d_fsdata; + struct bin_attribute *attr = to_bin_attr(dentry->d_parent); + struct kobject *kobj = to_kobj(dentry); return attr->write(kobj, buffer, offset, count); } @@ -95,7 +95,7 @@ static ssize_t write(struct file * file, static int open(struct inode * inode, struct file * file) { struct kobject *kobj = sysfs_get_kobject(file->f_dentry->d_parent); - struct bin_attribute * attr = file->f_dentry->d_fsdata; + struct bin_attribute * attr = to_bin_attr(file->f_dentry); int error = -EINVAL; if (!kobj || !attr) @@ -130,8 +130,8 @@ static int open(struct inode * inode, st static int release(struct inode * inode, struct file * file) { - struct kobject * kobj = file->f_dentry->d_parent->d_fsdata; - struct bin_attribute * attr = file->f_dentry->d_fsdata; + struct kobject * kobj = to_kobj(file->f_dentry->d_parent); + struct bin_attribute * attr = to_bin_attr(file->f_dentry); u8 * buffer = file->private_data; if (kobj) diff -puN fs/sysfs/file.c~sysfs-backing-store-prepare-file_operations fs/sysfs/file.c --- 25/fs/sysfs/file.c~sysfs-backing-store-prepare-file_operations 2004-08-15 13:41:59.593063264 -0700 +++ 25-akpm/fs/sysfs/file.c 2004-08-15 13:41:59.600062200 -0700 @@ -67,7 +67,7 @@ struct sysfs_buffer { /** * fill_read_buffer - allocate and fill buffer from object. - * @file: file pointer. + * @dentry: dentry pointer. * @buffer: data buffer for file. * * Allocate @buffer->page, if it hasn't been already, then call the @@ -75,10 +75,10 @@ struct sysfs_buffer { * data. * This is called only once, on the file's first read. */ -static int fill_read_buffer(struct file * file, struct sysfs_buffer * buffer) +static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer) { - struct attribute * attr = file->f_dentry->d_fsdata; - struct kobject * kobj = file->f_dentry->d_parent->d_fsdata; + struct attribute * attr = to_attr(dentry); + struct kobject * kobj = to_kobj(dentry->d_parent); struct sysfs_ops * ops = buffer->ops; int ret = 0; ssize_t count; @@ -150,7 +150,7 @@ sysfs_read_file(struct file *file, char ssize_t retval = 0; if (!*ppos) { - if ((retval = fill_read_buffer(file,buffer))) + if ((retval = fill_read_buffer(file->f_dentry,buffer))) return retval; } pr_debug("%s: count = %d, ppos = %lld, buf = %s\n", @@ -197,10 +197,10 @@ fill_write_buffer(struct sysfs_buffer * */ static int -flush_write_buffer(struct file * file, struct sysfs_buffer * buffer, size_t count) +flush_write_buffer(struct dentry * dentry, struct sysfs_buffer * buffer, size_t count) { - struct attribute * attr = file->f_dentry->d_fsdata; - struct kobject * kobj = file->f_dentry->d_parent->d_fsdata; + struct attribute * attr = to_attr(dentry); + struct kobject * kobj = to_kobj(dentry->d_parent); struct sysfs_ops * ops = buffer->ops; return ops->store(kobj,attr,buffer->page,count); @@ -231,7 +231,7 @@ sysfs_write_file(struct file *file, cons count = fill_write_buffer(buffer,buf,count); if (count > 0) - count = flush_write_buffer(file,buffer,count); + count = flush_write_buffer(file->f_dentry,buffer,count); if (count > 0) *ppos += count; return count; @@ -240,7 +240,7 @@ sysfs_write_file(struct file *file, cons static int check_perm(struct inode * inode, struct file * file) { struct kobject *kobj = sysfs_get_kobject(file->f_dentry->d_parent); - struct attribute * attr = file->f_dentry->d_fsdata; + struct attribute * attr = to_attr(file->f_dentry); struct sysfs_buffer * buffer; struct sysfs_ops * ops = NULL; int error = 0; @@ -321,8 +321,8 @@ static int sysfs_open_file(struct inode static int sysfs_release(struct inode * inode, struct file * filp) { - struct kobject * kobj = filp->f_dentry->d_parent->d_fsdata; - struct attribute * attr = filp->f_dentry->d_fsdata; + struct kobject * kobj = to_kobj(filp->f_dentry->d_parent); + struct attribute * attr = to_attr(filp->f_dentry); struct sysfs_buffer * buffer = filp->private_data; if (kobj) diff -puN fs/sysfs/sysfs.h~sysfs-backing-store-prepare-file_operations fs/sysfs/sysfs.h --- 25/fs/sysfs/sysfs.h~sysfs-backing-store-prepare-file_operations 2004-08-15 13:41:59.595062960 -0700 +++ 25-akpm/fs/sysfs/sysfs.h 2004-08-15 13:41:59.599062352 -0700 @@ -16,14 +16,30 @@ extern int sysfs_readlink(struct dentry extern int sysfs_follow_link(struct dentry *, struct nameidata *); extern struct rw_semaphore sysfs_rename_sem; +static inline struct kobject * to_kobj(struct dentry * dentry) +{ + return ((struct kobject *) dentry->d_fsdata); +} + +static inline struct attribute * to_attr(struct dentry * dentry) +{ + return ((struct attribute *) dentry->d_fsdata); +} + +static inline struct bin_attribute * to_bin_attr(struct dentry * dentry) +{ + return ((struct bin_attribute *) dentry->d_fsdata); +} + static inline struct kobject *sysfs_get_kobject(struct dentry *dentry) { struct kobject * kobj = NULL; spin_lock(&dcache_lock); if (!d_unhashed(dentry)) - kobj = kobject_get(dentry->d_fsdata); + kobj = kobject_get(to_kobj(dentry)); spin_unlock(&dcache_lock); return kobj; } + _