2.6.26-rc1

 block

diff --git a/block/genhd.c b/block/genhd.c
index 00da521..fda9c7a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -182,11 +182,17 @@ static int exact_lock(dev_t devt, void *data)
  */
 void add_disk(struct gendisk *disk)
 {
+   struct backing_dev_info *bdi;
+
    disk->flags |= GENHD_FL_UP;
    blk_register_region(MKDEV(disk->major, disk->first_minor),
              disk->minors, NULL, exact_match, exact_lock, disk);
    register_disk(disk);
    blk_register_queue(disk);
+
+   bdi = &disk->queue->backing_dev_info;
+   bdi_register_dev(bdi, MKDEV(disk->major, disk->first_minor));
+   sysfs_create_link(&disk->dev.kobj, &bdi->dev->kobj, "bdi");
 }
 
 EXPORT_SYMBOL(add_disk);
@@ -194,6 +200,8 @@ EXPORT_SYMBOL(del_gendisk);   /* in partitions/check.c */
 
 void unlink_gendisk(struct gendisk *disk)
 {
+   sysfs_remove_link(&disk->dev.kobj, "bdi");
+   bdi_unregister(&disk->queue->backing_dev_info);
    blk_unregister_queue(disk);
    blk_unregister_region(MKDEV(disk->major, disk->first_minor),
                disk->minors);