6 files changed, 16 insertions, 34 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 2484e0e9d89c..e10895647f72 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -62,6 +62,10 @@ config BLK_DEV_BSG
         protocols (e.g. Task Management Functions and SMP in Serial
         Attached SCSI).
 
+config BLOCK_COMPAT
+        bool
+        default y
+
 endif # BLOCK
 
 source block/Kconfig.iosched
diff --git a/block/Makefile b/block/Makefile
index 3cfe7cebaa6a..826108190f00 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -11,4 +11,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)       += cfq-iosched.o
 
 obj-$(CONFIG_BLK_DEV_IO_TRACE)  += blktrace.o
-obj-$(CONFIG_COMPAT)            += compat_ioctl.o
+obj-$(CONFIG_BLOCK_COMPAT)      += compat_ioctl.o
diff --git a/block/bsg.c b/block/bsg.c
index ed2646827234..b8ddfc66f210 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1010,10 +1010,7 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(bsg_register_queue);
 
-static struct cdev bsg_cdev = {
-        .kobj   = {.name = "bsg", },
-        .owner  = THIS_MODULE,
-};
+static struct cdev bsg_cdev;
 
 static int __init bsg_init(void)
 {
diff --git a/block/elevator.c b/block/elevator.c
index c6d153de9fd6..b9c518afe1f8 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q,
         eq->ops = &e->ops;
         eq->elevator_type = e;
         kobject_init(&eq->kobj);
-        snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched");
+        kobject_set_name(&eq->kobj, "%s", "iosched");
         eq->kobj.ktype = &elv_ktype;
         mutex_init(&eq->sysfs_lock);
 
diff --git a/block/genhd.c b/block/genhd.c
index 3af1e7a378d4..e609996f2e76 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -540,61 +540,42 @@ static int block_uevent_filter(struct kset *kset, struct kobject *kobj)
         return ((ktype == &ktype_block) || (ktype == &ktype_part));
 }
 
-static int block_uevent(struct kset *kset, struct kobject *kobj, char **envp,
-                         int num_envp, char *buffer, int buffer_size)
+static int block_uevent(struct kset *kset, struct kobject *kobj,
+                        struct kobj_uevent_env *env)
 {
         struct kobj_type *ktype = get_ktype(kobj);
         struct device *physdev;
         struct gendisk *disk;
         struct hd_struct *part;
-        int length = 0;
-        int i = 0;
 
         if (ktype == &ktype_block) {
                 disk = container_of(kobj, struct gendisk, kobj);
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "MINOR=%u", disk->first_minor);
+                add_uevent_var(env, "MINOR=%u", disk->first_minor);
         } else if (ktype == &ktype_part) {
                 disk = container_of(kobj->parent, struct gendisk, kobj);
                 part = container_of(kobj, struct hd_struct, kobj);
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "MINOR=%u",
+                add_uevent_var(env, "MINOR=%u",
                                disk->first_minor + part->partno);
         } else
                 return 0;
 
-        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                       "MAJOR=%u", disk->major);
+        add_uevent_var(env, "MAJOR=%u", disk->major);
 
         /* add physical device, backing this device  */
         physdev = disk->driverfs_dev;
         if (physdev) {
                 char *path = kobject_get_path(&physdev->kobj, GFP_KERNEL);
 
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "PHYSDEVPATH=%s", path);
+                add_uevent_var(env, "PHYSDEVPATH=%s", path);
                 kfree(path);
 
                 if (physdev->bus)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVBUS=%s",
-                                       physdev->bus->name);
+                        add_uevent_var(env, "PHYSDEVBUS=%s", physdev->bus->name);
 
                 if (physdev->driver)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVDRIVER=%s",
-                                       physdev->driver->name);
+                        add_uevent_var(env, physdev->driver->name);
         }
 
-        /* terminate, set to next free slot, shrink available space */
-        envp[i] = NULL;
-        envp = &envp[i];
-        num_envp -= i;
-        buffer = &buffer[length];
-        buffer_size -= length;
-
         return 0;
 }
 
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index cd9d2c5d91ae..d875673e76cd 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 
         init_timer(&q->unplug_timer);
 
-        snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue");
+        kobject_set_name(&q->kobj, "%s", "queue");
         q->kobj.ktype = &queue_ktype;
         kobject_init(&q->kobj);