]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] sysfs-iattr: attach sysfs_dirent before new inode
authorManeesh Soni <maneesh@in.ibm.com>
Tue, 31 May 2005 05:08:12 +0000 (10:38 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 20 Jun 2005 22:15:36 +0000 (15:15 -0700)
o The following patch makes sure to attach sysfs_dirent to the dentry before
  allocation a new inode through sysfs_create(). This change is done as
  preparatory work for implementing ->i_op->setattr() functionality for
  sysfs objects.

Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/sysfs/dir.c

index fe198210bc2d53081c018ac064e433715010daba..5cf3270014c01f4d40df1415a63d55687a93c3bf 100644 (file)
@@ -101,18 +101,19 @@ static int create_dir(struct kobject * k, struct dentry * p,
        down(&p->d_inode->i_sem);
        *d = sysfs_get_dentry(p,n);
        if (!IS_ERR(*d)) {
-               error = sysfs_create(*d, mode, init_dir);
+               error = sysfs_make_dirent(p->d_fsdata, *d, k, mode, SYSFS_DIR);
                if (!error) {
-                       error = sysfs_make_dirent(p->d_fsdata, *d, k, mode,
-                                               SYSFS_DIR);
+                       error = sysfs_create(*d, mode, init_dir);
                        if (!error) {
                                p->d_inode->i_nlink++;
                                (*d)->d_op = &sysfs_dentry_ops;
                                d_rehash(*d);
                        }
                }
-               if (error && (error != -EEXIST))
+               if (error && (error != -EEXIST)) {
+                       sysfs_put((*d)->d_fsdata);
                        d_drop(*d);
+               }
                dput(*d);
        } else
                error = PTR_ERR(*d);
@@ -171,17 +172,19 @@ static int sysfs_attach_attr(struct sysfs_dirent * sd, struct dentry * dentry)
                 init = init_file;
         }
 
+       dentry->d_fsdata = sysfs_get(sd);
+       sd->s_dentry = dentry;
        error = sysfs_create(dentry, (attr->mode & S_IALLUGO) | S_IFREG, init);
-       if (error)
+       if (error) {
+               sysfs_put(sd);
                return error;
+       }
 
         if (bin_attr) {
                dentry->d_inode->i_size = bin_attr->size;
                dentry->d_inode->i_fop = &bin_fops;
        }
        dentry->d_op = &sysfs_dentry_ops;
-       dentry->d_fsdata = sysfs_get(sd);
-       sd->s_dentry = dentry;
        d_rehash(dentry);
 
        return 0;
@@ -191,13 +194,15 @@ static int sysfs_attach_link(struct sysfs_dirent * sd, struct dentry * dentry)
 {
        int err = 0;
 
+       dentry->d_fsdata = sysfs_get(sd);
+       sd->s_dentry = dentry;
        err = sysfs_create(dentry, S_IFLNK|S_IRWXUGO, init_symlink);
        if (!err) {
                dentry->d_op = &sysfs_dentry_ops;
-               dentry->d_fsdata = sysfs_get(sd);
-               sd->s_dentry = dentry;
                d_rehash(dentry);
-       }
+       } else
+               sysfs_put(sd);
+
        return err;
 }