block: fix accounting bug on cross partition merges

[mv-sheeva.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 7a7b9c1644e4f26de810d54fd00a12302d56c927..2ba2792a3dd4e1f1d02fb1f0039825d43afbe8ac 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -116,6 +116,7 @@ struct hd_struct {
        struct disk_stats dkstats;
 #endif
        struct rcu_head rcu_head;
+       struct kref ref;
 };
 
 #define GENHD_FL_REMOVABLE                     1
@@ -583,6 +584,7 @@ extern struct hd_struct * __must_check add_partition(struct gendisk *disk,
                                                     sector_t len, int flags,
                                                     struct partition_meta_info
                                                       *info);
+extern void __delete_partition(struct kref *ref);
 extern void delete_partition(struct gendisk *, int);
 extern void printk_all_partitions(void);