/usr/src/kernel-patches/lustre/patches/sd_iostats-2.6-rhel5.patch is in linux-patch-lustre 1.8.5+dfsg-3ubuntu1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 | Index: linux-2.6.18-128.1.14/drivers/scsi/Kconfig
===================================================================
--- linux-2.6.18-128.1.14.orig/drivers/scsi/Kconfig 2009-06-19 12:33:12.000000000 -0600
+++ linux-2.6.18-128.1.14/drivers/scsi/Kconfig 2009-06-19 12:34:05.000000000 -0600
@@ -71,6 +71,14 @@
In this case, do not compile the driver for your SCSI host adapter
(below) as a module either.
+config SD_IOSTATS
+ bool "Enable SCSI disk I/O stats"
+ depends on BLK_DEV_SD
+ default y
+ ---help---
+ This enables SCSI disk I/O stats collection. You must also enable
+ /proc file system support if you want this feature.
+
config CHR_DEV_ST
tristate "SCSI tape support"
depends on SCSI
Index: linux-2.6.18-128.1.14/drivers/scsi/scsi_proc.c
===================================================================
--- linux-2.6.18-128.1.14.orig/drivers/scsi/scsi_proc.c 2009-06-19 12:33:12.000000000 -0600
+++ linux-2.6.18-128.1.14/drivers/scsi/scsi_proc.c 2009-06-19 12:34:05.000000000 -0600
@@ -40,7 +40,8 @@
/* 4K page size, but our output routines, use some slack for overruns */
#define PROC_BLOCK_SIZE (3*1024)
-static struct proc_dir_entry *proc_scsi;
+struct proc_dir_entry *proc_scsi;
+EXPORT_SYMBOL(proc_scsi);
/* Protect sht->present and sht->proc_dir */
static DEFINE_MUTEX(global_host_template_mutex);
Index: linux-2.6.18-128.1.14/drivers/scsi/sd.c
===================================================================
--- linux-2.6.18-128.1.14.orig/drivers/scsi/sd.c 2009-06-19 12:33:12.000000000 -0600
+++ linux-2.6.18-128.1.14/drivers/scsi/sd.c 2009-06-19 12:34:05.000000000 -0600
@@ -62,6 +62,63 @@
#include "scsi_logging.h"
+#if (defined(CONFIG_SD_IOSTATS) && defined(CONFIG_PROC_FS))
+# include <linux/proc_fs.h>
+# include <linux/seq_file.h>
+
+typedef struct {
+ unsigned long long iostat_size;
+ unsigned long long iostat_count;
+} iostat_counter_t;
+
+#define IOSTAT_NCOUNTERS 16
+typedef struct {
+ iostat_counter_t iostat_read_histogram[IOSTAT_NCOUNTERS];
+ iostat_counter_t iostat_write_histogram[IOSTAT_NCOUNTERS];
+ struct timeval iostat_timeval;
+
+ /* queue depth: how well the pipe is filled up */
+ unsigned long long iostat_queue_ticks[IOSTAT_NCOUNTERS];
+ unsigned long long iostat_queue_ticks_sum;
+ unsigned long iostat_queue_depth;
+ unsigned long iostat_queue_stamp;
+
+ /* seeks: how linear the traffic is */
+ unsigned long long iostat_next_sector;
+ unsigned long long iostat_seek_sectors;
+ unsigned long long iostat_seeks;
+ unsigned long long iostat_sectors;
+ unsigned long long iostat_reqs;
+ unsigned long iostat_read_reqs;
+ unsigned long iostat_write_reqs;
+
+ /* process time: how long it takes to process requests */
+ unsigned long iostat_rtime[IOSTAT_NCOUNTERS];
+ unsigned long iostat_wtime[IOSTAT_NCOUNTERS];
+
+ /* queue time: how long process spent in elevator's queue */
+ unsigned long iostat_rtime_in_queue[IOSTAT_NCOUNTERS];
+ unsigned long iostat_wtime_in_queue[IOSTAT_NCOUNTERS];
+
+ /* must be the last field, as it's used to know size to be memset'ed */
+ spinlock_t iostat_lock;
+} ____cacheline_aligned_in_smp iostat_stats_t;
+
+struct proc_dir_entry *sd_iostats_procdir = NULL;
+char sd_iostats_procdir_name[] = "sd_iostats";
+static struct file_operations sd_iostats_proc_fops;
+
+extern void sd_iostats_init(void);
+extern void sd_iostats_fini(void);
+void sd_iostats_start_req(struct scsi_cmnd *SCpnt);
+void sd_iostats_finish_req(struct scsi_cmnd *SCpnt);
+#else
+static inline void sd_iostats_init(void) {}
+static inline void sd_iostats_fini(void) {}
+static inline void sd_iostats_start_req(struct scsi_cmnd *SCpnt) {}
+static inline void sd_iostats_finish_req(struct scsi_cmnd *SCpnt) {}
+#endif
+
/*
* More than enough for everybody ;) The huge number of majors
* is a leftover from 16bit dev_t days, we don't really need that
@@ -126,6 +183,9 @@
unsigned WCE : 1; /* state of disk WCE bit */
unsigned RCD : 1; /* state of disk RCD bit, unused */
unsigned DPOFUA : 1; /* state of disk DPOFUA bit */
+#if (defined(CONFIG_SD_IOSTATS) && defined(CONFIG_PROC_FS))
+ iostat_stats_t *stats; /* scsi disk statistics */
+#endif
};
#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
@@ -557,6 +617,8 @@
*/
SCpnt->done = sd_rw_intr;
+ sd_iostats_start_req(SCpnt);
+
/*
* This indicates that the command is ready from our end to be
* queued.
@@ -1038,6 +1100,7 @@
break;
}
out:
+ sd_iostats_finish_req(SCpnt);
scsi_io_completion(SCpnt, good_bytes);
}
@@ -1733,6 +1796,36 @@
if (sdp->removable)
gd->flags |= GENHD_FL_REMOVABLE;
+#if (defined(CONFIG_SD_IOSTATS) && defined(CONFIG_PROC_FS))
+ sdkp->stats = kzalloc(sizeof(iostat_stats_t), GFP_KERNEL);
+ if (!sdkp->stats) {
+ printk(KERN_WARNING "cannot allocate iostat structure for"
+ "%s\n", gd->disk_name);
+ } else {
+ do_gettimeofday(&sdkp->stats->iostat_timeval);
+ sdkp->stats->iostat_queue_stamp = jiffies;
+ spin_lock_init(&sdkp->stats->iostat_lock);
+ if (sd_iostats_procdir) {
+ struct proc_dir_entry *pde;
+ pde = create_proc_entry(gd->disk_name, S_IRUGO | S_IWUSR,
+ sd_iostats_procdir);
+ if (!pde) {
+ printk(KERN_WARNING "Can't create /proc/scsi/"
+ "%s/%s\n",
+ sd_iostats_procdir_name,
+ gd->disk_name);
+ kfree(sdkp->stats);
+ sdkp->stats = NULL;
+ } else {
+ pde->proc_fops = &sd_iostats_proc_fops;
+ pde->data = gd;
+ }
+ } else {
+ kfree(sdkp->stats);
+ sdkp->stats = NULL;
+ }
+ }
+#endif
dev_set_drvdata(dev, sdkp);
add_disk(gd);
@@ -1776,6 +1869,366 @@
return 0;
}
+#if (defined(CONFIG_SD_IOSTATS) && defined(CONFIG_PROC_FS))
+static int
+sd_iostats_seq_show(struct seq_file *seq, void *v)
+{
+ struct timeval now;
+ struct gendisk *disk = seq->private;
+ iostat_stats_t *stats;
+ unsigned long long read_len;
+ unsigned long long read_len_tot;
+ unsigned long read_num;
+ unsigned long read_num_tot;
+ unsigned long long write_len;
+ unsigned long long write_len_tot;
+ unsigned long write_num;
+ unsigned long write_num_tot;
+ int i;
+ int maxi;
+
+ stats = scsi_disk(disk)->stats;
+ if (stats == NULL) {
+ printk(KERN_ERR "sd_iostats_seq_show: NULL stats entry\n");
+ BUG();
+ }
+
+ do_gettimeofday(&now);
+ now.tv_sec -= stats->iostat_timeval.tv_sec;
+ now.tv_usec -= stats->iostat_timeval.tv_usec;
+ if (now.tv_usec < 0) {
+ now.tv_usec += 1000000;
+ now.tv_sec--;
+ }
+
+ /* this sampling races with updates */
+ seq_printf(seq, "index: %lu snapshot_time: %lu.%06lu\n",
+ (unsigned long) scsi_disk(disk)->index,
+ now.tv_sec, now.tv_usec);
+
+ for (i = IOSTAT_NCOUNTERS - 1; i > 0; i--)
+ if (stats->iostat_read_histogram[i].iostat_count != 0 ||
+ stats->iostat_write_histogram[i].iostat_count != 0)
+ break;
+ maxi = i;
+
+ seq_printf(seq, "%8s %8s %12s %8s %12s\n", "size",
+ "reads", "total", "writes", "total");
+
+ read_len_tot = write_len_tot = 0;
+ read_num_tot = write_num_tot = 0;
+ for (i = 0; i <= maxi; i++) {
+ read_len = stats->iostat_read_histogram[i].iostat_size;
+ read_len_tot += read_len;
+ read_num = stats->iostat_read_histogram[i].iostat_count;
+ read_num_tot += read_num;
+
+ write_len = stats->iostat_write_histogram[i].iostat_size;
+ write_len_tot += write_len;
+ write_num = stats->iostat_write_histogram[i].iostat_count;
+ write_num_tot += write_num;
+
+ seq_printf (seq, "%8d %8lu %12llu %8lu %12llu\n",
+ 512<<i, read_num, read_len, write_num, write_len);
+ }
+
+ seq_printf(seq, "%8s %8lu %12llu %8lu %12llu\n\n", "total",
+ read_num_tot, read_len_tot,
+ write_num_tot, write_len_tot);
+
+ seq_printf(seq, "%8s %8s %8s\n", "qdepth", "ticks", "%");
+ for (i = 0; i < IOSTAT_NCOUNTERS; i++) {
+ unsigned long long ticks, percent;
+ ticks = stats->iostat_queue_ticks[i];
+ if (ticks == 0)
+ continue;
+ percent = stats->iostat_queue_ticks[i] * 100;
+ do_div(percent, stats->iostat_queue_ticks_sum);
+ seq_printf(seq, "%8d %8llu %8llu\n", i, ticks, percent);
+ }
+
+ if (stats->iostat_reqs != 0) {
+ unsigned long long aveseek = 0, percent = 0;
+
+ if (stats->iostat_seeks) {
+ aveseek = stats->iostat_seek_sectors;
+ do_div(aveseek, stats->iostat_seeks);
+ percent = stats->iostat_seeks * 100;
+ do_div(percent, stats->iostat_reqs);
+ }
+
+ seq_printf(seq, "\n%llu sectors in %llu reqs: %llu seek(s) over "
+ "%llu sectors in ave, %llu%% of all reqs\n",
+ stats->iostat_sectors, stats->iostat_reqs,
+ stats->iostat_seeks, aveseek, percent);
+ }
+
+ seq_printf(seq, "\n%16s %8s %8s %8s %8s\n", "process time", "reads",
+ "%%", "writes", "%%");
+ for (i = 0; i < IOSTAT_NCOUNTERS; i++) {
+ unsigned long read_percent = 0, write_percent = 0;
+ if (stats->iostat_wtime[i] == 0 &&
+ stats->iostat_rtime[i] == 0)
+ continue;
+ if (stats->iostat_read_reqs)
+ read_percent = stats->iostat_rtime[i] * 100 /
+ stats->iostat_read_reqs;
+ if (stats->iostat_write_reqs)
+ write_percent = stats->iostat_wtime[i] * 100 /
+ stats->iostat_write_reqs;
+ seq_printf(seq, "%16u %8lu %8lu %8lu %8lu\n",
+ jiffies_to_msecs(((1UL << i) >> 1) << 1),
+ stats->iostat_rtime[i], read_percent,
+ stats->iostat_wtime[i], write_percent);
+ }
+
+ seq_printf(seq, "\n%16s %8s %8s %8s %8s\n", "time in queue", "reads",
+ "%%", "writes", "%%");
+ for (i = 0; i < IOSTAT_NCOUNTERS; i++) {
+ unsigned long read_percent = 0, write_percent = 0;
+ if (stats->iostat_wtime_in_queue[i] == 0 &&
+ stats->iostat_rtime_in_queue[i] == 0)
+ continue;
+ if (stats->iostat_read_reqs)
+ read_percent = stats->iostat_rtime_in_queue[i] * 100 /
+ stats->iostat_read_reqs;
+ if (stats->iostat_write_reqs)
+ write_percent = stats->iostat_wtime_in_queue[i] * 100 /
+ stats->iostat_write_reqs;
+ seq_printf(seq, "%16u %8lu %8lu %8lu %8lu\n",
+ jiffies_to_msecs(((1UL << i) >> 1) << 1),
+ stats->iostat_rtime_in_queue[i],
+ read_percent,
+ stats->iostat_wtime_in_queue[i],
+ write_percent);
+ }
+
+ return 0;
+}
+
+static void *
+sd_iostats_seq_start(struct seq_file *p, loff_t *pos)
+{
+ return (*pos == 0) ? (void *)1 : NULL;
+}
+
+static void *
+sd_iostats_seq_next(struct seq_file *p, void *v, loff_t *pos)
+{
+ ++*pos;
+ return NULL;
+}
+
+static void
+sd_iostats_seq_stop(struct seq_file *p, void *v)
+{
+}
+
+static struct seq_operations sd_iostats_seqops = {
+ .start = sd_iostats_seq_start,
+ .stop = sd_iostats_seq_stop,
+ .next = sd_iostats_seq_next,
+ .show = sd_iostats_seq_show,
+};
+
+static int
+sd_iostats_seq_open (struct inode *inode, struct file *file)
+{
+ int rc;
+
+ rc = seq_open(file, &sd_iostats_seqops);
+ if (rc != 0)
+ return rc;
+
+ ((struct seq_file *)file->private_data)->private = PDE(inode)->data;
+ return 0;
+}
+
+static ssize_t
+sd_iostats_seq_write(struct file *file, const char *buffer,
+ size_t len, loff_t *off)
+{
+ struct seq_file *seq = file->private_data;
+ struct gendisk *disk = seq->private;
+ iostat_stats_t *stats = scsi_disk(disk)->stats;
+ unsigned long flags;
+ unsigned long qdepth;
+
+
+ spin_lock_irqsave (&stats->iostat_lock, flags);
+ qdepth = stats->iostat_queue_depth;
+ memset (stats, 0, offsetof(iostat_stats_t, iostat_lock));
+ do_gettimeofday(&stats->iostat_timeval);
+ stats->iostat_queue_stamp = jiffies;
+ stats->iostat_queue_depth = qdepth;
+ spin_unlock_irqrestore (&stats->iostat_lock, flags);
+
+ return len;
+}
+
+static struct file_operations sd_iostats_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = sd_iostats_seq_open,
+ .read = seq_read,
+ .write = sd_iostats_seq_write,
+ .llseek = seq_lseek,
+ .release = seq_release,
+};
+
+extern struct proc_dir_entry *proc_scsi;
+
+void
+sd_iostats_init(void)
+{
+ if (proc_scsi == NULL) {
+ printk(KERN_WARNING "No access to sd iostats: "
+ "proc_scsi is NULL\n");
+ return;
+ }
+
+ sd_iostats_procdir = create_proc_entry(sd_iostats_procdir_name,
+ S_IFDIR | S_IRUGO | S_IXUGO,
+ proc_scsi);
+ if (sd_iostats_procdir == NULL) {
+ printk(KERN_WARNING "No access to sd iostats: "
+ "can't create /proc/scsi/%s\n", sd_iostats_procdir_name);
+ return;
+ }
+}
+
+void sd_iostats_fini(void)
+{
+ if (proc_scsi != NULL && sd_iostats_procdir != NULL)
+ remove_proc_entry(sd_iostats_procdir_name, proc_scsi);
+
+ sd_iostats_procdir = NULL;
+}
+
+void sd_iostats_finish_req(struct scsi_cmnd *SCpnt)
+{
+ struct request *rq = SCpnt->request;
+ iostat_stats_t *stats;
+ unsigned long *tcounter;
+ int tbucket;
+ int tmp;
+ unsigned long irqflags;
+ unsigned long i;
+
+ stats = scsi_disk(rq->rq_disk)->stats;
+ if (stats == NULL)
+ return;
+
+ tmp = jiffies - rq->start_time;
+ for (tbucket = 0; tmp > 1; tbucket++)
+ tmp >>= 1;
+ if (tbucket >= IOSTAT_NCOUNTERS)
+ tbucket = IOSTAT_NCOUNTERS - 1;
+ //printk("%u ticks in D to %u\n", jiffies - rq->start_time, tbucket);
+
+ tcounter = rq_data_dir(rq) == WRITE ?
+ &stats->iostat_wtime[tbucket] : &stats->iostat_rtime[tbucket];
+
+ spin_lock_irqsave(&stats->iostat_lock, irqflags);
+
+ /* update delay stats */
+ (*tcounter)++;
+
+ /* update queue depth stats */
+ i = stats->iostat_queue_depth;
+ if (i >= IOSTAT_NCOUNTERS)
+ i = IOSTAT_NCOUNTERS - 1;
+ stats->iostat_queue_ticks[i] += jiffies - stats->iostat_queue_stamp;
+ stats->iostat_queue_ticks_sum += jiffies - stats->iostat_queue_stamp;
+ BUG_ON(stats->iostat_queue_depth == 0);
+ stats->iostat_queue_depth--;
+
+ /* update seek stats. XXX: not sure about nr_sectors */
+ stats->iostat_sectors += rq->nr_sectors;
+ stats->iostat_reqs++;
+ if (rq->sector != stats->iostat_next_sector) {
+ stats->iostat_seek_sectors +=
+ rq->sector > stats->iostat_next_sector ?
+ rq->sector - stats->iostat_next_sector :
+ stats->iostat_next_sector - rq->sector;
+ stats->iostat_seeks++;
+ }
+ stats->iostat_next_sector = rq->sector + rq->nr_sectors;
+
+ stats->iostat_queue_stamp = jiffies;
+
+ spin_unlock_irqrestore(&stats->iostat_lock, irqflags);
+}
+
+void sd_iostats_start_req(struct scsi_cmnd *SCpnt)
+{
+ struct request *rq = SCpnt->request;
+ iostat_stats_t *stats;
+ iostat_counter_t *counter;
+ int bucket;
+ int tbucket;
+ int tmp;
+ unsigned long irqflags;
+ unsigned long i;
+ int nsect;
+
+ stats = scsi_disk(rq->rq_disk)->stats;
+ if (stats == NULL)
+ return;
+
+ nsect = SCpnt->request_bufflen >> 9;
+ for (bucket = 0, tmp = nsect; tmp > 1; bucket++)
+ tmp >>= 1;
+
+ if (bucket >= IOSTAT_NCOUNTERS) {
+ printk (KERN_ERR "sd_iostats_bump: nsect %d too big\n", nsect);
+ BUG();
+ }
+
+ counter = rq_data_dir(rq) == WRITE ?
+ &stats->iostat_write_histogram[bucket] :
+ &stats->iostat_read_histogram[bucket];
+
+ tmp = jiffies - rq->start_time;
+ for (tbucket = 0; tmp > 1; tbucket++)
+ tmp >>= 1;
+ if (tbucket >= IOSTAT_NCOUNTERS)
+ tbucket = IOSTAT_NCOUNTERS - 1;
+ //printk("%u ticks in Q to %u\n", jiffies - rq->start_time, tbucket);
+
+ /* an ugly hack to know exact processing time. the right
+ * solution is to add one more field to struct request
+ * hopefully it will break nothing ... */
+ rq->start_time = jiffies;
+
+ spin_lock_irqsave(&stats->iostat_lock, irqflags);
+
+ /* update queue depth stats */
+ i = stats->iostat_queue_depth;
+ if (i >= IOSTAT_NCOUNTERS)
+ i = IOSTAT_NCOUNTERS - 1;
+ stats->iostat_queue_ticks[i] += jiffies - stats->iostat_queue_stamp;
+ stats->iostat_queue_ticks_sum += jiffies - stats->iostat_queue_stamp;
+ stats->iostat_queue_depth++;
+
+ /* update delay stats */
+ if (rq_data_dir(rq) == WRITE) {
+ stats->iostat_wtime_in_queue[tbucket]++;
+ stats->iostat_write_reqs++;
+ } else {
+ stats->iostat_rtime_in_queue[tbucket]++;
+ stats->iostat_read_reqs++;
+ }
+
+ /* update size stats */
+ counter->iostat_size += nsect;
+ counter->iostat_count++;
+
+ stats->iostat_queue_stamp = jiffies;
+
+ spin_unlock_irqrestore(&stats->iostat_lock, irqflags);
+}
+#endif
+
/**
* scsi_disk_release - Called to free the scsi_disk structure
* @cdev: pointer to embedded class device
@@ -1794,10 +2247,16 @@
idr_remove(&sd_index_idr, sdkp->index);
spin_unlock(&sd_index_lock);
+#if (defined(CONFIG_SD_IOSTATS) && defined(CONFIG_PROC_FS))
+ if (sdkp->stats) {
+ remove_proc_entry(disk->disk_name, sd_iostats_procdir);
+ kfree(sdkp->stats);
+ sdkp->stats = NULL;
+ }
+#endif
disk->private_data = NULL;
put_disk(disk);
put_device(&sdkp->device->sdev_gendev);
-
kfree(sdkp);
}
@@ -1905,6 +2364,7 @@
static int __init init_sd(void)
{
int majors = 0, i;
+ int rc = 0;
SCSI_LOG_HLQUEUE(3, printk("init_sd: sd driver entry point\n"));
@@ -1915,9 +2375,13 @@
if (!majors)
return -ENODEV;
+ sd_iostats_init();
class_register(&sd_disk_class);
- return scsi_register_driver(&sd_template.gendrv);
+ rc = scsi_register_driver(&sd_template.gendrv);
+ if (rc)
+ sd_iostats_fini();
+ return rc;
}
/**
@@ -1936,6 +2400,7 @@
unregister_blkdev(sd_major(i), "sd");
class_unregister(&sd_disk_class);
+ sd_iostats_fini();
}
module_init(init_sd);
|