diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-25 00:06:02 +0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-25 00:06:02 +0400 |
| commit | f253b86b4ad1b3220544e75880510fd455ebd23f (patch) | |
| tree | cc2dd76b8ffc8df4356c1e95bd15276169dd335e /include/linux/blkdev.h | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
| download | linux-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.xz | |
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/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 009b80e49f53..646b462d04df 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -115,7 +115,6 @@ struct request { void *elevator_private3; struct gendisk *rq_disk; - struct hd_struct *part; unsigned long start_time; #ifdef CONFIG_BLK_CGROUP unsigned long long start_time_ns; |