lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "block: fix accounting bug on cross partition merges"

Browse Source 
This reverts commit 7681bfeecc.

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>
This commit is contained in:
Jens Axboe
2010-10-24 22:06:02 +02:00
parent 35da7a307c
commit f253b86b4a
8 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/blkdev.h
View File

@ -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;