Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / fs / configfs / symlink.c

diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index 2a731ef..0004d18 100644 (file)
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -77,12 +77,15 @@ static int create_link(struct config_item *parent_item,
        sl = kmalloc(sizeof(struct configfs_symlink), GFP_KERNEL);
        if (sl) {
                sl->sl_target = config_item_get(item);
-               /* FIXME: needs a lock, I'd bet */
+               spin_lock(&configfs_dirent_lock);
                list_add(&sl->sl_list, &target_sd->s_links);
+               spin_unlock(&configfs_dirent_lock);
                ret = configfs_create_link(sl, parent_item->ci_dentry,
                                           dentry);
                if (ret) {
+                       spin_lock(&configfs_dirent_lock);
                        list_del_init(&sl->sl_list);
+                       spin_unlock(&configfs_dirent_lock);
                        config_item_put(item);
                        kfree(sl);
                }
@@ -137,8 +140,12 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
                goto out_put;
 
        ret = type->ct_item_ops->allow_link(parent_item, target_item);
-       if (!ret)
+       if (!ret) {
                ret = create_link(parent_item, target_item, dentry);
+               if (ret && type->ct_item_ops->drop_link)
+                       type->ct_item_ops->drop_link(parent_item,
+                                                    target_item);
+       }
 
        config_item_put(target_item);
        path_put(&nd.path);
@@ -169,7 +176,9 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
        parent_item = configfs_get_config_item(dentry->d_parent);
        type = parent_item->ci_type;
 
+       spin_lock(&configfs_dirent_lock);
        list_del_init(&sd->s_sibling);
+       spin_unlock(&configfs_dirent_lock);
        configfs_drop_dentry(sd, dentry->d_parent);
        dput(dentry);
        configfs_put(sd);
@@ -184,8 +193,9 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
                type->ct_item_ops->drop_link(parent_item,
                                               sl->sl_target);
 
-       /* FIXME: Needs lock */
+       spin_lock(&configfs_dirent_lock);
        list_del_init(&sl->sl_list);
+       spin_unlock(&configfs_dirent_lock);
 
        /* Put reference from create_link() */
        config_item_put(sl->sl_target);