aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-01-07 08:43:37 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-01-07 08:43:37 +0100
commit6c23a9681c0fe7fb7dd331b39dda11926f43746e (patch)
treebf113a475a17faa866e7e59806378107dcb3aa40 /block/blk-merge.c
parent09e099d4bafea3b15be003d548bdf94b4b6e0e17 (diff)
downloadlinux-linaro-stable-6c23a9681c0fe7fb7dd331b39dda11926f43746e.tar.gz
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>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c2
1 files changed, 1 insertions, 1 deletions
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();
}
}