Merge branch 'merge.nfs-fs_parse.1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index d41c21fef13887fd242596e0a6951f34b28a55da..c4ab045926b7c02d8cff6674af590310d6d1f5a7 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -449,7 +449,7 @@ int __compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
        }
 
        link = kernfs_create_link(kobj->sd, target_name, entry);
-       if (IS_ERR(link) && PTR_ERR(link) == -EEXIST)
+       if (PTR_ERR(link) == -EEXIST)
                sysfs_warn_dup(kobj->sd, target_name);
 
        kernfs_put(entry);