mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-05 23:23:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

Browse Source 
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] block layer: ioprio_best function fix
  [PATCH] ide-cd: fix breakage with internally queued commands
  [PATCH] block layer: elv_iosched_show should get elv_list_lock
  [PATCH] splice: fix pipe_to_file() ->prepare_write() error path
  [PATCH] block layer: elevator_find function cleanup
  [PATCH] elevator: elevator_type member not used
This commit is contained in:
Linus Torvalds
2006-10-12 07:49:46 -07:00
parent 9ff4680e99 d58cdfb89c
commit da79cbae39
6 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/blkdev.h
View File

@@ -157,6 +157,7 @@ enum rq_cmd_type_bits {
REQ_TYPE_ATA_CMD,
REQ_TYPE_ATA_TASK,
REQ_TYPE_ATA_TASKFILE,
REQ_TYPE_ATA_PC,
};
/*

1
include/linux/elevator.h
View File

@@ -70,7 +70,6 @@ struct elevator_type
{
struct list_head list;
struct elevator_ops ops;
struct elevator_type *elevator_type;
struct elv_fs_entry *elevator_attrs;
char elevator_name[ELV_NAME_MAX];
struct module *elevator_owner;