Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

1 files changed, 31 insertions, 2 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 82d3b79d0e08..66aeb4fff0c3 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -434,6 +434,26 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
 }
 
 /**
+ *      sysfs_pathname - return full path to sysfs dirent
+ *      @sd: sysfs_dirent whose path we want
+ *      @path: caller allocated buffer
+ *
+ *      Gives the name "/" to the sysfs_root entry; any path returned
+ *      is relative to wherever sysfs is mounted.
+ *
+ *      XXX: does no error checking on @path size
+ */
+static char *sysfs_pathname(struct sysfs_dirent *sd, char *path)
+{
+        if (sd->s_parent) {
+                sysfs_pathname(sd->s_parent, path);
+                strcat(path, "/");
+        }
+        strcat(path, sd->s_name);
+        return path;
+}
+
+/**
  *      sysfs_add_one - add sysfs_dirent to parent
  *      @acxt: addrm context to use
  *      @sd: sysfs_dirent to be added
@@ -458,8 +478,16 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
         int ret;
 
         ret = __sysfs_add_one(acxt, sd);
-        WARN(ret == -EEXIST, KERN_WARNING "sysfs: duplicate filename '%s' "
-                       "can not be created\n", sd->s_name);
+        if (ret == -EEXIST) {
+                char *path = kzalloc(PATH_MAX, GFP_KERNEL);
+                WARN(1, KERN_WARNING
+                     "sysfs: cannot create duplicate filename '%s'\n",
+                     (path == NULL) ? sd->s_name :
+                     strcat(strcat(sysfs_pathname(acxt->parent_sd, path), "/"),
+                            sd->s_name));
+                kfree(path);
+        }
+
         return ret;
 }
 
@@ -581,6 +609,7 @@ void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
 
                 sysfs_drop_dentry(sd);
                 sysfs_deactivate(sd);
+                unmap_bin_file(sd);
                 sysfs_put(sd);
         }
 }