diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:45:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:45:10 -0400 |
| commit | 8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch) | |
| tree | a49914306fb28505c6e21a456df8bdc40d6eac23 /include/linux/blkdev.h | |
| parent | 4b37ba90f49d4157ac5628f8d730d3505f176724 (diff) | |
| parent | f253b86b4ad1b3220544e75880510fd455ebd23f (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "block: fix accounting bug on cross partition merges"
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 { | |||
| 115 | void *elevator_private3; | 115 | void *elevator_private3; |
| 116 | 116 | ||
| 117 | struct gendisk *rq_disk; | 117 | struct gendisk *rq_disk; |
| 118 | struct hd_struct *part; | ||
| 119 | unsigned long start_time; | 118 | unsigned long start_time; |
| 120 | #ifdef CONFIG_BLK_CGROUP | 119 | #ifdef CONFIG_BLK_CGROUP |
| 121 | unsigned long long start_time_ns; | 120 | unsigned long long start_time_ns; |