diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
| commit | 8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch) | |
| tree | a49914306fb28505c6e21a456df8bdc40d6eac23 /include/linux | |
| parent | 4b37ba90f49d4157ac5628f8d730d3505f176724 (diff) | |
| parent | f253b86b4ad1b3220544e75880510fd455ebd23f (diff) | |
| download | op-kernel-dev-8e775167d54e6521e7cdbc03ee7ec42a8c67b49a.zip op-kernel-dev-8e775167d54e6521e7cdbc03ee7ec42a8c67b49a.tar.gz | |
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')
| -rw-r--r-- | include/linux/blkdev.h | 1 | ||||
| -rw-r--r-- | include/linux/elevator.h | 2 | ||||
| -rw-r--r-- | include/linux/genhd.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 009b80e..646b462 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; diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 80a0ece..4fd978e 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -122,8 +122,6 @@ extern void elv_completed_request(struct request_queue *, struct request *); extern int elv_set_request(struct request_queue *, struct request *, gfp_t); extern void elv_put_request(struct request_queue *, struct request *); extern void elv_drain_elevator(struct request_queue *); -extern void elv_quiesce_start(struct request_queue *); -extern void elv_quiesce_end(struct request_queue *); /* * io scheduler registration diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 557c392..7a7b9c1 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[]; }; |
