diff --git a/[refs] b/[refs] index be85a55ae892..3fe6aba10559 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc8c85871c9728c5fddca6854a191fd41eb9438c +refs/heads/master: 5c3e8964ce87477a12e3e9edc3742156a3929a74 diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c index da4bb66a610c..5d95aa8e23c6 100644 --- a/trunk/fs/sysfs/dir.c +++ b/trunk/fs/sysfs/dir.c @@ -428,8 +428,12 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, */ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) { - if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) + if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) { + printk(KERN_WARNING "sysfs: duplicate filename '%s' " + "can not be created\n", sd->s_name); + WARN_ON(1); return -EEXIST; + } sd->s_parent = sysfs_get(acxt->parent_sd);