tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds bcd039b2 e67b23c7

+29 -23
-2
block/as-iosched.c
··· 1 1 /* 2 - * linux/drivers/block/as-iosched.c 3 - * 4 2 * Anticipatory & deadline i/o scheduler. 5 3 * 6 4 * Copyright (C) 2002 Jens Axboe <axboe@suse.de>
-2
block/cfq-iosched.c
··· 1 1 /* 2 - * linux/drivers/block/cfq-iosched.c 3 - * 4 2 * CFQ, or complete fairness queueing, disk scheduler. 5 3 * 6 4 * Based on ideas from a previously unfinished io
-2
block/deadline-iosched.c
··· 1 1 /* 2 - * linux/drivers/block/deadline-iosched.c 3 - * 4 2 * Deadline i/o scheduler. 5 3 * 6 4 * Copyright (C) 2002 Jens Axboe <axboe@suse.de>
-2
block/elevator.c
··· 1 1 /* 2 - * linux/drivers/block/elevator.c 3 - * 4 2 * Block device elevator/IO-scheduler. 5 3 * 6 4 * Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
-2
block/ll_rw_blk.c
··· 1 1 /* 2 - * linux/drivers/block/ll_rw_blk.c 3 - * 4 2 * Copyright (C) 1991, 1992 Linus Torvalds 5 3 * Copyright (C) 1994, Karl Keyte: Added support for disk statistics 6 4 * Elevator latency, (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
+28 -12
drivers/block/cciss.c
··· 1017 1017 status = -ENOMEM; 1018 1018 goto cleanup1; 1019 1019 } 1020 - if (ioc->Request.Type.Direction == XFER_WRITE && 1021 - copy_from_user(buff[sg_used], data_ptr, sz)) { 1020 + if (ioc->Request.Type.Direction == XFER_WRITE) { 1021 + if (copy_from_user(buff[sg_used], data_ptr, sz)) { 1022 1022 status = -ENOMEM; 1023 - goto cleanup1; 1023 + goto cleanup1; 1024 + } 1024 1025 } else { 1025 1026 memset(buff[sg_used], 0, sz); 1026 1027 } ··· 1139 1138 1140 1139 for(i=0; i< NWD; i++) { 1141 1140 struct gendisk *disk = host->gendisk[i]; 1142 - if (disk->flags & GENHD_FL_UP) 1143 - del_gendisk(disk); 1141 + if (disk) { 1142 + request_queue_t *q = disk->queue; 1143 + 1144 + if (disk->flags & GENHD_FL_UP) 1145 + del_gendisk(disk); 1146 + if (q) 1147 + blk_cleanup_queue(q); 1148 + put_disk(disk); 1149 + } 1144 1150 } 1145 1151 1146 1152 /* ··· 1461 1453 * allows us to delete disk zero but keep the controller registered. 1462 1454 */ 1463 1455 if (h->gendisk[0] != disk){ 1464 - if (disk->flags & GENHD_FL_UP){ 1465 - blk_cleanup_queue(disk->queue); 1466 - del_gendisk(disk); 1467 - drv->queue = NULL; 1456 + if (disk) { 1457 + request_queue_t *q = disk->queue; 1458 + if (disk->flags & GENHD_FL_UP) 1459 + del_gendisk(disk); 1460 + if (q) 1461 + blk_cleanup_queue(q); 1462 + put_disk(disk); 1468 1463 } 1469 1464 } 1470 1465 ··· 3236 3225 /* remove it from the disk list */ 3237 3226 for (j = 0; j < NWD; j++) { 3238 3227 struct gendisk *disk = hba[i]->gendisk[j]; 3239 - if (disk->flags & GENHD_FL_UP) { 3240 - del_gendisk(disk); 3241 - blk_cleanup_queue(disk->queue); 3228 + if (disk) { 3229 + request_queue_t *q = disk->queue; 3230 + 3231 + if (disk->flags & GENHD_FL_UP) 3232 + del_gendisk(disk); 3233 + if (q) 3234 + blk_cleanup_queue(q); 3235 + put_disk(disk); 3242 3236 } 3243 3237 } 3244 3238
+1 -1
include/linux/cciss_ioctl.h
··· 10 10 typedef struct _cciss_pci_info_struct 11 11 { 12 12 unsigned char bus; 13 - unsigned short domain; 14 13 unsigned char dev_fn; 14 + unsigned short domain; 15 15 __u32 board_id; 16 16 } cciss_pci_info_struct; 17 17