[PATCH] swap: scan_swap_map drop swap_device_lock

[linux-2.6] / fs / sysfs / dir.c

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index fe198210bc2d53081c018ac064e433715010daba..59734ba1ee6026556af405cfe77a6bf21f30084e 100644 (file)
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -8,6 +8,7 @@
 #include <linux/mount.h>
 #include <linux/module.h>
 #include <linux/kobject.h>
+#include <linux/namei.h>
 #include "sysfs.h"
 
 DECLARE_RWSEM(sysfs_rename_sem);
@@ -99,20 +100,21 @@ static int create_dir(struct kobject * k, struct dentry * p,
        umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;
 
        down(&p->d_inode->i_sem);
-       *d = sysfs_get_dentry(p,n);
+       *d = lookup_one_len(n, p, strlen(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 +173,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 +195,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;
 }
 
@@ -228,6 +234,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 
 struct inode_operations sysfs_dir_inode_operations = {
        .lookup         = sysfs_lookup,
+       .setattr        = sysfs_setattr,
 };
 
 static void remove_dir(struct dentry * d)
@@ -309,7 +316,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
 
        down(&parent->d_inode->i_sem);
 
-       new_dentry = sysfs_get_dentry(parent, new_name);
+       new_dentry = lookup_one_len(new_name, parent, strlen(new_name));
        if (!IS_ERR(new_dentry)) {
                if (!new_dentry->d_inode) {
                        error = kobject_set_name(kobj, "%s", new_name);