Merge branch 'linus' into perfcounters/rename

Merge reason: pull in all the latest code before doing the rename.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 6 insertions, 6 deletions

diff --git a/block/bsg.c b/block/bsg.c
index 5f184bb3ff9e..0676301f16d0 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1062,7 +1062,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
 
 static struct cdev bsg_cdev;
 
-static char *bsg_nodename(struct device *dev)
+static char *bsg_devnode(struct device *dev, mode_t *mode)
 {
         return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));
 }
@@ -1087,7 +1087,7 @@ static int __init bsg_init(void)
                 ret = PTR_ERR(bsg_class);
                 goto destroy_kmemcache;
         }
-        bsg_class->nodename = bsg_nodename;
+        bsg_class->devnode = bsg_devnode;
 
         ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
         if (ret)
diff --git a/block/genhd.c b/block/genhd.c
index 2ad91ddad8e2..517e4332cb37 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -998,12 +998,12 @@ struct class block_class = {
         .name           = "block",
 };
 
-static char *block_nodename(struct device *dev)
+static char *block_devnode(struct device *dev, mode_t *mode)
 {
         struct gendisk *disk = dev_to_disk(dev);
 
-        if (disk->nodename)
-                return disk->nodename(disk);
+        if (disk->devnode)
+                return disk->devnode(disk, mode);
         return NULL;
 }
 
@@ -1011,7 +1011,7 @@ static struct device_type disk_type = {
         .name           = "disk",
         .groups         = disk_attr_groups,
         .release        = disk_release,
-        .nodename       = block_nodename,
+        .devnode        = block_devnode,
 };
 
 #ifdef CONFIG_PROC_FS