diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-24 22:06:02 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-24 22:06:02 +0200 |
| commit | f253b86b4ad1b3220544e75880510fd455ebd23f (patch) | |
| tree | cc2dd76b8ffc8df4356c1e95bd15276169dd335e /include/linux/genhd.h | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
| download | linux-stable-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.gz linux-stable-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.bz2 linux-stable-f253b86b4ad1b3220544e75880510fd455ebd23f.zip | |
Revert "block: fix accounting bug on cross partition merges"
This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327.
Conflicts:
include/linux/genhd.h
It has numerous issues with the cleanup path and non-elevator
devices. Revert it for now so we can come up with a clean
version without rushing things.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 557c3927e70f..7a7b9c1644e4 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -140,7 +140,6 @@ struct disk_part_tbl { struct rcu_head rcu_head; int len; struct hd_struct __rcu *last_lookup; - struct gendisk *disk; struct hd_struct __rcu *part[]; }; |