blob: 2ae2cb3f362fb4984907d54a625c6e5af3b5f779 [file] [log] [blame]
Jens Axboe8324aa92008-01-29 14:51:59 +01001/*
2 * Functions related to sysfs handling
3 */
4#include <linux/kernel.h>
5#include <linux/module.h>
6#include <linux/bio.h>
7#include <linux/blkdev.h>
8#include <linux/blktrace_api.h>
9
10#include "blk.h"
11
12struct queue_sysfs_entry {
13 struct attribute attr;
14 ssize_t (*show)(struct request_queue *, char *);
15 ssize_t (*store)(struct request_queue *, const char *, size_t);
16};
17
18static ssize_t
Xiaotian Feng9cb308c2009-07-17 15:26:26 +080019queue_var_show(unsigned long var, char *page)
Jens Axboe8324aa92008-01-29 14:51:59 +010020{
Xiaotian Feng9cb308c2009-07-17 15:26:26 +080021 return sprintf(page, "%lu\n", var);
Jens Axboe8324aa92008-01-29 14:51:59 +010022}
23
24static ssize_t
25queue_var_store(unsigned long *var, const char *page, size_t count)
26{
27 char *p = (char *) page;
28
29 *var = simple_strtoul(p, &p, 10);
30 return count;
31}
32
33static ssize_t queue_requests_show(struct request_queue *q, char *page)
34{
35 return queue_var_show(q->nr_requests, (page));
36}
37
38static ssize_t
39queue_requests_store(struct request_queue *q, const char *page, size_t count)
40{
41 struct request_list *rl = &q->rq;
42 unsigned long nr;
Jens Axboeb8a9ae72009-09-11 22:44:29 +020043 int ret;
44
45 if (!q->request_fn)
46 return -EINVAL;
47
48 ret = queue_var_store(&nr, page, count);
Jens Axboe8324aa92008-01-29 14:51:59 +010049 if (nr < BLKDEV_MIN_RQ)
50 nr = BLKDEV_MIN_RQ;
51
52 spin_lock_irq(q->queue_lock);
53 q->nr_requests = nr;
54 blk_queue_congestion_threshold(q);
55
Jens Axboe1faa16d2009-04-06 14:48:01 +020056 if (rl->count[BLK_RW_SYNC] >= queue_congestion_on_threshold(q))
57 blk_set_queue_congested(q, BLK_RW_SYNC);
58 else if (rl->count[BLK_RW_SYNC] < queue_congestion_off_threshold(q))
59 blk_clear_queue_congested(q, BLK_RW_SYNC);
Jens Axboe8324aa92008-01-29 14:51:59 +010060
Jens Axboe1faa16d2009-04-06 14:48:01 +020061 if (rl->count[BLK_RW_ASYNC] >= queue_congestion_on_threshold(q))
62 blk_set_queue_congested(q, BLK_RW_ASYNC);
63 else if (rl->count[BLK_RW_ASYNC] < queue_congestion_off_threshold(q))
64 blk_clear_queue_congested(q, BLK_RW_ASYNC);
Jens Axboe8324aa92008-01-29 14:51:59 +010065
Jens Axboe1faa16d2009-04-06 14:48:01 +020066 if (rl->count[BLK_RW_SYNC] >= q->nr_requests) {
67 blk_set_queue_full(q, BLK_RW_SYNC);
68 } else if (rl->count[BLK_RW_SYNC]+1 <= q->nr_requests) {
69 blk_clear_queue_full(q, BLK_RW_SYNC);
70 wake_up(&rl->wait[BLK_RW_SYNC]);
Jens Axboe8324aa92008-01-29 14:51:59 +010071 }
72
Jens Axboe1faa16d2009-04-06 14:48:01 +020073 if (rl->count[BLK_RW_ASYNC] >= q->nr_requests) {
74 blk_set_queue_full(q, BLK_RW_ASYNC);
75 } else if (rl->count[BLK_RW_ASYNC]+1 <= q->nr_requests) {
76 blk_clear_queue_full(q, BLK_RW_ASYNC);
77 wake_up(&rl->wait[BLK_RW_ASYNC]);
Jens Axboe8324aa92008-01-29 14:51:59 +010078 }
79 spin_unlock_irq(q->queue_lock);
80 return ret;
81}
82
83static ssize_t queue_ra_show(struct request_queue *q, char *page)
84{
Xiaotian Feng9cb308c2009-07-17 15:26:26 +080085 unsigned long ra_kb = q->backing_dev_info.ra_pages <<
86 (PAGE_CACHE_SHIFT - 10);
Jens Axboe8324aa92008-01-29 14:51:59 +010087
88 return queue_var_show(ra_kb, (page));
89}
90
91static ssize_t
92queue_ra_store(struct request_queue *q, const char *page, size_t count)
93{
94 unsigned long ra_kb;
95 ssize_t ret = queue_var_store(&ra_kb, page, count);
96
Jens Axboe8324aa92008-01-29 14:51:59 +010097 q->backing_dev_info.ra_pages = ra_kb >> (PAGE_CACHE_SHIFT - 10);
Jens Axboe8324aa92008-01-29 14:51:59 +010098
99 return ret;
100}
101
102static ssize_t queue_max_sectors_show(struct request_queue *q, char *page)
103{
Martin K. Petersenae03bf62009-05-22 17:17:50 -0400104 int max_sectors_kb = queue_max_sectors(q) >> 1;
Jens Axboe8324aa92008-01-29 14:51:59 +0100105
106 return queue_var_show(max_sectors_kb, (page));
107}
108
Martin K. Petersene1defc42009-05-22 17:17:49 -0400109static ssize_t queue_logical_block_size_show(struct request_queue *q, char *page)
Martin K. Petersene68b9032008-01-29 19:14:08 +0100110{
Martin K. Petersene1defc42009-05-22 17:17:49 -0400111 return queue_var_show(queue_logical_block_size(q), page);
Martin K. Petersene68b9032008-01-29 19:14:08 +0100112}
113
Martin K. Petersenc72758f2009-05-22 17:17:53 -0400114static ssize_t queue_physical_block_size_show(struct request_queue *q, char *page)
115{
116 return queue_var_show(queue_physical_block_size(q), page);
117}
118
119static ssize_t queue_io_min_show(struct request_queue *q, char *page)
120{
121 return queue_var_show(queue_io_min(q), page);
122}
123
124static ssize_t queue_io_opt_show(struct request_queue *q, char *page)
125{
126 return queue_var_show(queue_io_opt(q), page);
Jens Axboe8324aa92008-01-29 14:51:59 +0100127}
128
Martin K. Petersen86b37282009-11-10 11:50:21 +0100129static ssize_t queue_discard_granularity_show(struct request_queue *q, char *page)
130{
131 return queue_var_show(q->limits.discard_granularity, page);
132}
133
134static ssize_t queue_discard_max_show(struct request_queue *q, char *page)
135{
136 return queue_var_show(q->limits.max_discard_sectors << 9, page);
137}
138
Martin K. Petersen98262f22009-12-03 09:24:48 +0100139static ssize_t queue_discard_zeroes_data_show(struct request_queue *q, char *page)
140{
141 return queue_var_show(queue_discard_zeroes_data(q), page);
142}
143
Jens Axboe8324aa92008-01-29 14:51:59 +0100144static ssize_t
145queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
146{
147 unsigned long max_sectors_kb,
Martin K. Petersenae03bf62009-05-22 17:17:50 -0400148 max_hw_sectors_kb = queue_max_hw_sectors(q) >> 1,
Jens Axboe8324aa92008-01-29 14:51:59 +0100149 page_kb = 1 << (PAGE_CACHE_SHIFT - 10);
150 ssize_t ret = queue_var_store(&max_sectors_kb, page, count);
151
152 if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb)
153 return -EINVAL;
Wu Fengguang7c239512008-11-25 09:08:39 +0100154
Jens Axboe8324aa92008-01-29 14:51:59 +0100155 spin_lock_irq(q->queue_lock);
Nikanth Karthikesanc295fc02009-09-01 22:40:15 +0200156 q->limits.max_sectors = max_sectors_kb << 1;
Jens Axboe8324aa92008-01-29 14:51:59 +0100157 spin_unlock_irq(q->queue_lock);
158
159 return ret;
160}
161
162static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)
163{
Martin K. Petersenae03bf62009-05-22 17:17:50 -0400164 int max_hw_sectors_kb = queue_max_hw_sectors(q) >> 1;
Jens Axboe8324aa92008-01-29 14:51:59 +0100165
166 return queue_var_show(max_hw_sectors_kb, (page));
167}
168
Bartlomiej Zolnierkiewicz1308835f2009-01-07 12:22:39 +0100169static ssize_t queue_nonrot_show(struct request_queue *q, char *page)
170{
171 return queue_var_show(!blk_queue_nonrot(q), page);
172}
173
174static ssize_t queue_nonrot_store(struct request_queue *q, const char *page,
175 size_t count)
176{
177 unsigned long nm;
178 ssize_t ret = queue_var_store(&nm, page, count);
179
180 spin_lock_irq(q->queue_lock);
181 if (nm)
182 queue_flag_clear(QUEUE_FLAG_NONROT, q);
183 else
184 queue_flag_set(QUEUE_FLAG_NONROT, q);
185 spin_unlock_irq(q->queue_lock);
186
187 return ret;
188}
189
Alan D. Brunelleac9fafa2008-04-29 14:44:19 +0200190static ssize_t queue_nomerges_show(struct request_queue *q, char *page)
191{
Alan D. Brunelle488991e2010-01-29 09:04:08 +0100192 return queue_var_show((blk_queue_nomerges(q) << 1) |
193 blk_queue_noxmerges(q), page);
Alan D. Brunelleac9fafa2008-04-29 14:44:19 +0200194}
195
196static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,
197 size_t count)
198{
199 unsigned long nm;
200 ssize_t ret = queue_var_store(&nm, page, count);
201
Jens Axboebf0f9702008-05-07 09:09:39 +0200202 spin_lock_irq(q->queue_lock);
Alan D. Brunelle488991e2010-01-29 09:04:08 +0100203 queue_flag_clear(QUEUE_FLAG_NOMERGES, q);
204 queue_flag_clear(QUEUE_FLAG_NOXMERGES, q);
205 if (nm == 2)
Jens Axboebf0f9702008-05-07 09:09:39 +0200206 queue_flag_set(QUEUE_FLAG_NOMERGES, q);
Alan D. Brunelle488991e2010-01-29 09:04:08 +0100207 else if (nm)
208 queue_flag_set(QUEUE_FLAG_NOXMERGES, q);
Jens Axboebf0f9702008-05-07 09:09:39 +0200209 spin_unlock_irq(q->queue_lock);
Bartlomiej Zolnierkiewicz1308835f2009-01-07 12:22:39 +0100210
Alan D. Brunelleac9fafa2008-04-29 14:44:19 +0200211 return ret;
212}
213
Jens Axboec7c22e42008-09-13 20:26:01 +0200214static ssize_t queue_rq_affinity_show(struct request_queue *q, char *page)
215{
Xiaotian Feng9cb308c2009-07-17 15:26:26 +0800216 bool set = test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags);
Jens Axboec7c22e42008-09-13 20:26:01 +0200217
Xiaotian Feng9cb308c2009-07-17 15:26:26 +0800218 return queue_var_show(set, page);
Jens Axboec7c22e42008-09-13 20:26:01 +0200219}
220
221static ssize_t
222queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)
223{
224 ssize_t ret = -EINVAL;
225#if defined(CONFIG_USE_GENERIC_SMP_HELPERS)
226 unsigned long val;
227
228 ret = queue_var_store(&val, page, count);
229 spin_lock_irq(q->queue_lock);
230 if (val)
231 queue_flag_set(QUEUE_FLAG_SAME_COMP, q);
232 else
233 queue_flag_clear(QUEUE_FLAG_SAME_COMP, q);
234 spin_unlock_irq(q->queue_lock);
235#endif
236 return ret;
237}
Jens Axboe8324aa92008-01-29 14:51:59 +0100238
Jens Axboebc58ba92009-01-23 10:54:44 +0100239static ssize_t queue_iostats_show(struct request_queue *q, char *page)
240{
241 return queue_var_show(blk_queue_io_stat(q), page);
242}
243
244static ssize_t queue_iostats_store(struct request_queue *q, const char *page,
245 size_t count)
246{
247 unsigned long stats;
248 ssize_t ret = queue_var_store(&stats, page, count);
249
250 spin_lock_irq(q->queue_lock);
251 if (stats)
252 queue_flag_set(QUEUE_FLAG_IO_STAT, q);
253 else
254 queue_flag_clear(QUEUE_FLAG_IO_STAT, q);
255 spin_unlock_irq(q->queue_lock);
256
257 return ret;
258}
259
Jens Axboe8324aa92008-01-29 14:51:59 +0100260static struct queue_sysfs_entry queue_requests_entry = {
261 .attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },
262 .show = queue_requests_show,
263 .store = queue_requests_store,
264};
265
266static struct queue_sysfs_entry queue_ra_entry = {
267 .attr = {.name = "read_ahead_kb", .mode = S_IRUGO | S_IWUSR },
268 .show = queue_ra_show,
269 .store = queue_ra_store,
270};
271
272static struct queue_sysfs_entry queue_max_sectors_entry = {
273 .attr = {.name = "max_sectors_kb", .mode = S_IRUGO | S_IWUSR },
274 .show = queue_max_sectors_show,
275 .store = queue_max_sectors_store,
276};
277
278static struct queue_sysfs_entry queue_max_hw_sectors_entry = {
279 .attr = {.name = "max_hw_sectors_kb", .mode = S_IRUGO },
280 .show = queue_max_hw_sectors_show,
281};
282
283static struct queue_sysfs_entry queue_iosched_entry = {
284 .attr = {.name = "scheduler", .mode = S_IRUGO | S_IWUSR },
285 .show = elv_iosched_show,
286 .store = elv_iosched_store,
287};
288
Martin K. Petersene68b9032008-01-29 19:14:08 +0100289static struct queue_sysfs_entry queue_hw_sector_size_entry = {
290 .attr = {.name = "hw_sector_size", .mode = S_IRUGO },
Martin K. Petersene1defc42009-05-22 17:17:49 -0400291 .show = queue_logical_block_size_show,
292};
293
294static struct queue_sysfs_entry queue_logical_block_size_entry = {
295 .attr = {.name = "logical_block_size", .mode = S_IRUGO },
296 .show = queue_logical_block_size_show,
Martin K. Petersene68b9032008-01-29 19:14:08 +0100297};
298
Martin K. Petersenc72758f2009-05-22 17:17:53 -0400299static struct queue_sysfs_entry queue_physical_block_size_entry = {
300 .attr = {.name = "physical_block_size", .mode = S_IRUGO },
301 .show = queue_physical_block_size_show,
302};
303
304static struct queue_sysfs_entry queue_io_min_entry = {
305 .attr = {.name = "minimum_io_size", .mode = S_IRUGO },
306 .show = queue_io_min_show,
307};
308
309static struct queue_sysfs_entry queue_io_opt_entry = {
310 .attr = {.name = "optimal_io_size", .mode = S_IRUGO },
311 .show = queue_io_opt_show,
Jens Axboe8324aa92008-01-29 14:51:59 +0100312};
313
Martin K. Petersen86b37282009-11-10 11:50:21 +0100314static struct queue_sysfs_entry queue_discard_granularity_entry = {
315 .attr = {.name = "discard_granularity", .mode = S_IRUGO },
316 .show = queue_discard_granularity_show,
317};
318
319static struct queue_sysfs_entry queue_discard_max_entry = {
320 .attr = {.name = "discard_max_bytes", .mode = S_IRUGO },
321 .show = queue_discard_max_show,
322};
323
Martin K. Petersen98262f22009-12-03 09:24:48 +0100324static struct queue_sysfs_entry queue_discard_zeroes_data_entry = {
325 .attr = {.name = "discard_zeroes_data", .mode = S_IRUGO },
326 .show = queue_discard_zeroes_data_show,
327};
328
Bartlomiej Zolnierkiewicz1308835f2009-01-07 12:22:39 +0100329static struct queue_sysfs_entry queue_nonrot_entry = {
330 .attr = {.name = "rotational", .mode = S_IRUGO | S_IWUSR },
331 .show = queue_nonrot_show,
332 .store = queue_nonrot_store,
333};
334
Alan D. Brunelleac9fafa2008-04-29 14:44:19 +0200335static struct queue_sysfs_entry queue_nomerges_entry = {
336 .attr = {.name = "nomerges", .mode = S_IRUGO | S_IWUSR },
337 .show = queue_nomerges_show,
338 .store = queue_nomerges_store,
339};
340
Jens Axboec7c22e42008-09-13 20:26:01 +0200341static struct queue_sysfs_entry queue_rq_affinity_entry = {
342 .attr = {.name = "rq_affinity", .mode = S_IRUGO | S_IWUSR },
343 .show = queue_rq_affinity_show,
344 .store = queue_rq_affinity_store,
345};
346
Jens Axboebc58ba92009-01-23 10:54:44 +0100347static struct queue_sysfs_entry queue_iostats_entry = {
348 .attr = {.name = "iostats", .mode = S_IRUGO | S_IWUSR },
349 .show = queue_iostats_show,
350 .store = queue_iostats_store,
351};
352
Jens Axboe8324aa92008-01-29 14:51:59 +0100353static struct attribute *default_attrs[] = {
354 &queue_requests_entry.attr,
355 &queue_ra_entry.attr,
356 &queue_max_hw_sectors_entry.attr,
357 &queue_max_sectors_entry.attr,
358 &queue_iosched_entry.attr,
Martin K. Petersene68b9032008-01-29 19:14:08 +0100359 &queue_hw_sector_size_entry.attr,
Martin K. Petersene1defc42009-05-22 17:17:49 -0400360 &queue_logical_block_size_entry.attr,
Martin K. Petersenc72758f2009-05-22 17:17:53 -0400361 &queue_physical_block_size_entry.attr,
362 &queue_io_min_entry.attr,
363 &queue_io_opt_entry.attr,
Martin K. Petersen86b37282009-11-10 11:50:21 +0100364 &queue_discard_granularity_entry.attr,
365 &queue_discard_max_entry.attr,
Martin K. Petersen98262f22009-12-03 09:24:48 +0100366 &queue_discard_zeroes_data_entry.attr,
Bartlomiej Zolnierkiewicz1308835f2009-01-07 12:22:39 +0100367 &queue_nonrot_entry.attr,
Alan D. Brunelleac9fafa2008-04-29 14:44:19 +0200368 &queue_nomerges_entry.attr,
Jens Axboec7c22e42008-09-13 20:26:01 +0200369 &queue_rq_affinity_entry.attr,
Jens Axboebc58ba92009-01-23 10:54:44 +0100370 &queue_iostats_entry.attr,
Jens Axboe8324aa92008-01-29 14:51:59 +0100371 NULL,
372};
373
374#define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)
375
376static ssize_t
377queue_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
378{
379 struct queue_sysfs_entry *entry = to_queue(attr);
380 struct request_queue *q =
381 container_of(kobj, struct request_queue, kobj);
382 ssize_t res;
383
384 if (!entry->show)
385 return -EIO;
386 mutex_lock(&q->sysfs_lock);
387 if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)) {
388 mutex_unlock(&q->sysfs_lock);
389 return -ENOENT;
390 }
391 res = entry->show(q, page);
392 mutex_unlock(&q->sysfs_lock);
393 return res;
394}
395
396static ssize_t
397queue_attr_store(struct kobject *kobj, struct attribute *attr,
398 const char *page, size_t length)
399{
400 struct queue_sysfs_entry *entry = to_queue(attr);
Jens Axboe6728cb02008-01-31 13:03:55 +0100401 struct request_queue *q;
Jens Axboe8324aa92008-01-29 14:51:59 +0100402 ssize_t res;
403
404 if (!entry->store)
405 return -EIO;
Jens Axboe6728cb02008-01-31 13:03:55 +0100406
407 q = container_of(kobj, struct request_queue, kobj);
Jens Axboe8324aa92008-01-29 14:51:59 +0100408 mutex_lock(&q->sysfs_lock);
409 if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)) {
410 mutex_unlock(&q->sysfs_lock);
411 return -ENOENT;
412 }
413 res = entry->store(q, page, length);
414 mutex_unlock(&q->sysfs_lock);
415 return res;
416}
417
418/**
419 * blk_cleanup_queue: - release a &struct request_queue when it is no longer needed
420 * @kobj: the kobj belonging of the request queue to be released
421 *
422 * Description:
423 * blk_cleanup_queue is the pair to blk_init_queue() or
424 * blk_queue_make_request(). It should be called when a request queue is
425 * being released; typically when a block device is being de-registered.
426 * Currently, its primary task it to free all the &struct request
427 * structures that were allocated to the queue and the queue itself.
428 *
429 * Caveat:
430 * Hopefully the low level driver will have finished any
431 * outstanding requests first...
432 **/
433static void blk_release_queue(struct kobject *kobj)
434{
435 struct request_queue *q =
436 container_of(kobj, struct request_queue, kobj);
437 struct request_list *rl = &q->rq;
438
439 blk_sync_queue(q);
440
441 if (rl->rq_pool)
442 mempool_destroy(rl->rq_pool);
443
444 if (q->queue_tags)
445 __blk_queue_free_tags(q);
446
447 blk_trace_shutdown(q);
448
449 bdi_destroy(&q->backing_dev_info);
450 kmem_cache_free(blk_requestq_cachep, q);
451}
452
Emese Revfy52cf25d2010-01-19 02:58:23 +0100453static const struct sysfs_ops queue_sysfs_ops = {
Jens Axboe8324aa92008-01-29 14:51:59 +0100454 .show = queue_attr_show,
455 .store = queue_attr_store,
456};
457
458struct kobj_type blk_queue_ktype = {
459 .sysfs_ops = &queue_sysfs_ops,
460 .default_attrs = default_attrs,
461 .release = blk_release_queue,
462};
463
464int blk_register_queue(struct gendisk *disk)
465{
466 int ret;
Li Zefan1d54ad62009-04-14 14:00:05 +0800467 struct device *dev = disk_to_dev(disk);
Jens Axboe8324aa92008-01-29 14:51:59 +0100468
469 struct request_queue *q = disk->queue;
470
Akinobu Mitafb199742008-04-21 09:51:06 +0200471 if (WARN_ON(!q))
Jens Axboe8324aa92008-01-29 14:51:59 +0100472 return -ENXIO;
473
Li Zefan1d54ad62009-04-14 14:00:05 +0800474 ret = blk_trace_init_sysfs(dev);
475 if (ret)
476 return ret;
477
Linus Torvaldsc9059592009-06-11 10:52:27 -0700478 ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue");
Jens Axboe8324aa92008-01-29 14:51:59 +0100479 if (ret < 0)
480 return ret;
481
482 kobject_uevent(&q->kobj, KOBJ_ADD);
483
Martin K. Petersencd43e262009-05-22 17:17:52 -0400484 if (!q->request_fn)
485 return 0;
486
Jens Axboe8324aa92008-01-29 14:51:59 +0100487 ret = elv_register_queue(q);
488 if (ret) {
489 kobject_uevent(&q->kobj, KOBJ_REMOVE);
490 kobject_del(&q->kobj);
Zdenek Kabelac48c0d4d2009-09-25 06:19:26 +0200491 blk_trace_remove_sysfs(disk_to_dev(disk));
Jens Axboe8324aa92008-01-29 14:51:59 +0100492 return ret;
493 }
494
495 return 0;
496}
497
498void blk_unregister_queue(struct gendisk *disk)
499{
500 struct request_queue *q = disk->queue;
501
Akinobu Mitafb199742008-04-21 09:51:06 +0200502 if (WARN_ON(!q))
503 return;
504
Zdenek Kabelac48c0d4d2009-09-25 06:19:26 +0200505 if (q->request_fn)
Jens Axboe8324aa92008-01-29 14:51:59 +0100506 elv_unregister_queue(q);
507
Zdenek Kabelac48c0d4d2009-09-25 06:19:26 +0200508 kobject_uevent(&q->kobj, KOBJ_REMOVE);
509 kobject_del(&q->kobj);
510 blk_trace_remove_sysfs(disk_to_dev(disk));
511 kobject_put(&disk_to_dev(disk)->kobj);
Jens Axboe8324aa92008-01-29 14:51:59 +0100512}