Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / fs / configfs / symlink.c

diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index 0f3eb41d9201e6884db26cc8cedf6f3b8328dd25..cc9f2546ea4a041273654b6076d1fbc774d447e4 100644 (file)
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -110,13 +110,13 @@ out:
 
 
 static int get_target(const char *symname, struct path *path,
-                     struct config_item **target)
+                     struct config_item **target, struct super_block *sb)
 {
        int ret;
 
        ret = kern_path(symname, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, path);
        if (!ret) {
-               if (path->dentry->d_sb == configfs_sb) {
+               if (path->dentry->d_sb == sb) {
                        *target = configfs_get_config_item(path->dentry);
                        if (!*target) {
                                ret = -ENOENT;
@@ -141,10 +141,6 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
        struct config_item *target_item = NULL;
        struct config_item_type *type;
 
-       ret = -EPERM;  /* What lack-of-symlink returns */
-       if (dentry->d_parent == configfs_sb->s_root)
-               goto out;
-
        sd = dentry->d_parent->d_fsdata;
        /*
         * Fake invisibility if dir belongs to a group/default groups hierarchy
@@ -162,7 +158,7 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
            !type->ct_item_ops->allow_link)
                goto out_put;
 
-       ret = get_target(symname, &path, &target_item);
+       ret = get_target(symname, &path, &target_item, dentry->d_sb);
        if (ret)
                goto out_put;
 
@@ -198,8 +194,6 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
        if (!(sd->s_type & CONFIGFS_ITEM_LINK))
                goto out;
 
-       BUG_ON(dentry->d_parent == configfs_sb->s_root);
-
        sl = sd->s_element;
 
        parent_item = configfs_get_config_item(dentry->d_parent);