3 files changed, 6 insertions, 6 deletions

diff --git a/block/blk.h b/block/blk.h
index d2e49af90db5..6e1ed40534e9 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -99,8 +99,8 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
 static inline int blk_cpu_to_group(int cpu)
 {
 #ifdef CONFIG_SCHED_MC
-        cpumask_t mask = cpu_coregroup_map(cpu);
-        return first_cpu(mask);
+        const struct cpumask *mask = cpu_coregroup_mask(cpu);
+        return cpumask_first(mask);
 #elif defined(CONFIG_SCHED_SMT)
         return first_cpu(per_cpu(cpu_sibling_map, cpu));
 #else
diff --git a/block/bsg.c b/block/bsg.c
index e73e50daf3d0..d414bb5607e8 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -42,7 +42,7 @@ struct bsg_device {
         int done_cmds;
         wait_queue_head_t wq_done;
         wait_queue_head_t wq_free;
-        char name[BUS_ID_SIZE];
+        char name[20];
         int max_queue;
         unsigned long flags;
 };
@@ -781,7 +781,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
         mutex_lock(&bsg_mutex);
         hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
 
-        strncpy(bd->name, rq->bsg_dev.class_dev->bus_id, sizeof(bd->name) - 1);
+        strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
         dprintk("bound to <%s>, max queue %d\n",
                 format_dev_t(buf, inode->i_rdev), bd->max_queue);
 
@@ -992,7 +992,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
         if (name)
                 devname = name;
         else
-                devname = parent->bus_id;
+                devname = dev_name(parent);
 
         /*
          * we need a proper transport to send commands, not a stacked device
diff --git a/block/genhd.c b/block/genhd.c
index d84a7df1e2a0..397960cf26af 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1084,7 +1084,7 @@ dev_t blk_lookup_devt(const char *name, int partno)
                 struct gendisk *disk = dev_to_disk(dev);
                 struct hd_struct *part;
 
-                if (strcmp(dev->bus_id, name))
+                if (strcmp(dev_name(dev), name))
                         continue;
 
                 part = disk_get_part(disk, partno);