block: add internal hd part table references

We can't use krefs since it's apparently restricted to very basic
reference counting.

This reverts commit e4a683c8.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

3 files changed, 6 insertions, 5 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 500c080a6a6b..2f4002f79a24 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -70,7 +70,7 @@ static void drive_stat_acct(struct request *rq, int new_io)
                 part_stat_inc(cpu, part, merges[rw]);
         } else {
                 part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));
-                if (!kref_test_and_get(&part->ref)) {
+                if (!hd_struct_try_get(part)) {
                         /*
                          * The partition is already being removed,
                          * the request will be accounted on the disk only
@@ -80,7 +80,7 @@ static void drive_stat_acct(struct request *rq, int new_io)
                          * it as any other partition.
                          */
                         part = &rq->rq_disk->part0;
-                        kref_get(&part->ref);
+                        hd_struct_get(part);
                 }
                 part_round_stats(cpu, part);
                 part_inc_in_flight(part, rw);
@@ -1818,7 +1818,7 @@ static void blk_account_io_done(struct request *req)
                 part_round_stats(cpu, part);
                 part_dec_in_flight(part, rw);
 
-                kref_put(&part->ref, __delete_partition);
+                hd_struct_put(part);
                 part_stat_unlock();
         }
 }
diff --git a/block/blk-merge.c b/block/blk-merge.c
index b06b83b89d89..00b7d31b38a2 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -356,7 +356,7 @@ static void blk_account_io_merge(struct request *req)
                 part_round_stats(cpu, part);
                 part_dec_in_flight(part, rq_data_dir(req));
 
-                kref_put(&part->ref, __delete_partition);
+                hd_struct_put(part);
                 part_stat_unlock();
         }
 }
diff --git a/block/genhd.c b/block/genhd.c
index 85c150598830..399d37ec7412 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1192,7 +1192,8 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
                         return NULL;
                 }
                 disk->part_tbl->part[0] = &disk->part0;
-                kref_init(&disk->part0.ref);
+
+                hd_ref_init(&disk->part0);
 
                 disk->minors = minors;
                 rand_initialize_disk(disk);