[RFC 4/5] sysfs backing store (leaves only) - sysfs-leaves-bin.patch

Maneesh Soni
2003-12-29T09:39:53Z

fs/sysfs/bin.c | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)

diff -puN fs/sysfs/bin.c~sysfs-leaves-bin fs/sysfs/bin.c
--- linux-2.6.0/fs/sysfs/bin.c~sysfs-leaves-bin 2003-12-29 12:28:56.000000000 +0530
+++ linux-2.6.0-maneesh/fs/sysfs/bin.c 2003-12-29 12:29:00.000000000 +0530
@@ -17,8 +17,10 @@
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 sysfs_dirent * sd_attr = dentry->d_fsdata;
+ struct bin_attribute * attr = sd_attr->s_element;
+ struct sysfs_dirent * sd_kobj = dentry->d_parent->d_fsdata;
+ struct kobject * kobj = sd_kobj->s_element;

return attr->read(kobj, buffer, off, count);
}
@@ -60,8 +62,10 @@ 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 sysfs_dirent * sd_attr = dentry->d_fsdata;
+ struct bin_attribute * attr = sd_attr->s_element;
+ struct sysfs_dirent * sd_kobj = dentry->d_parent->d_fsdata;
+ struct kobject * kobj = sd_kobj->s_element;

return attr->write(kobj, buffer, offset, count);
}
@@ -94,8 +98,10 @@ static ssize_t write(struct file * file,

static int open(struct inode * inode, struct file * file)
{
- struct kobject * kobj = kobject_get(file->f_dentry->d_parent->d_fsdata);
- struct bin_attribute * attr = file->f_dentry->d_fsdata;
+ struct sysfs_dirent * sd_kobj = file->f_dentry->d_parent->d_fsdata;
+ struct kobject * kobj = kobject_get(sd_kobj->s_element);
+ struct sysfs_dirent * sd_attr = file->f_dentry->d_fsdata;
+ struct bin_attribute * attr = sd_attr->s_element;
int error = -EINVAL;

if (!kobj || !attr)
@@ -122,7 +128,9 @@ 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 sysfs_dirent * sd = file->f_dentry->d_parent->d_fsdata;
+ struct kobject * kobj = sd->s_element;
+
u8 * buffer = file->private_data;

if (kobj)
@@ -131,7 +139,7 @@ static int release(struct inode * inode,
return 0;
}

-static struct file_operations bin_fops = {
+struct file_operations bin_fops = {
.read = read,
.write = write,
.llseek = generic_file_llseek,
@@ -148,31 +156,10 @@ static struct file_operations bin_fops =

int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)
{
- struct dentry * dentry;
- struct dentry * parent;
- int error = 0;
-
- if (!kobj || !attr)
- return -EINVAL;
-
- parent = kobj->dentry;
-
- down(&parent->d_inode->i_sem);
- dentry = sysfs_get_dentry(parent,attr->attr.name);
- if (!IS_ERR(dentry)) {
- dentry->d_fsdata = (void *)attr;
- error = sysfs_create(dentry,
- (attr->attr.mode & S_IALLUGO) | S_IFREG,
- NULL);
- if (!error) {
- dentry->d_inode->i_size = attr->size;
- dentry->d_inode->i_fop = &bin_fops;
- }
- dput(dentry);
- } else
- error = PTR_ERR(dentry);
- up(&parent->d_inode->i_sem);
- return error;
+ if (kobj && kobj->dentry && attr)
+ return sysfs_add_file(kobj->dentry, SYSFS_KOBJ_BIN_ATTR,
+ &attr->attr);
+ return -EINVAL;