]> bbs.cooldavid.org Git - net-next-2.6.git/blame - fs/partitions/check.c
fs/partitions/acorn.c: remove dead code
[net-next-2.6.git] / fs / partitions / check.c
CommitLineData
1da177e4
LT
1/*
2 * fs/partitions/check.c
3 *
4 * Code extracted from drivers/block/genhd.c
5 * Copyright (C) 1991-1998 Linus Torvalds
6 * Re-organised Feb 1998 Russell King
7 *
8 * We now have independent partition support from the
9 * block drivers, which allows all the partition code to
10 * be grouped in one location, and it to be mostly self
11 * contained.
12 *
13 * Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl}
14 */
15
16#include <linux/init.h>
17#include <linux/module.h>
18#include <linux/fs.h>
19#include <linux/kmod.h>
20#include <linux/ctype.h>
6f2576af 21#include <linux/genhd.h>
1da177e4
LT
22
23#include "check.h"
1da177e4
LT
24
25#include "acorn.h"
26#include "amiga.h"
27#include "atari.h"
28#include "ldm.h"
29#include "mac.h"
30#include "msdos.h"
31#include "osf.h"
32#include "sgi.h"
33#include "sun.h"
34#include "ibm.h"
35#include "ultrix.h"
36#include "efi.h"
0e6e1db4 37#include "karma.h"
19d0e8ce 38#include "sysv68.h"
1da177e4
LT
39
40#ifdef CONFIG_BLK_DEV_MD
41extern void md_autodetect_dev(dev_t dev);
42#endif
43
44int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
45
46static int (*check_part[])(struct parsed_partitions *, struct block_device *) = {
47 /*
48 * Probe partition formats with tables at disk address 0
49 * that also have an ADFS boot block at 0xdc0.
50 */
51#ifdef CONFIG_ACORN_PARTITION_ICS
52 adfspart_check_ICS,
53#endif
54#ifdef CONFIG_ACORN_PARTITION_POWERTEC
55 adfspart_check_POWERTEC,
56#endif
57#ifdef CONFIG_ACORN_PARTITION_EESOX
58 adfspart_check_EESOX,
59#endif
60
61 /*
62 * Now move on to formats that only have partition info at
63 * disk address 0xdc0. Since these may also have stale
64 * PC/BIOS partition tables, they need to come before
65 * the msdos entry.
66 */
67#ifdef CONFIG_ACORN_PARTITION_CUMANA
68 adfspart_check_CUMANA,
69#endif
70#ifdef CONFIG_ACORN_PARTITION_ADFS
71 adfspart_check_ADFS,
72#endif
73
74#ifdef CONFIG_EFI_PARTITION
75 efi_partition, /* this must come before msdos */
76#endif
77#ifdef CONFIG_SGI_PARTITION
78 sgi_partition,
79#endif
80#ifdef CONFIG_LDM_PARTITION
81 ldm_partition, /* this must come before msdos */
82#endif
1da177e4
LT
83#ifdef CONFIG_MSDOS_PARTITION
84 msdos_partition,
85#endif
86#ifdef CONFIG_OSF_PARTITION
87 osf_partition,
88#endif
89#ifdef CONFIG_SUN_PARTITION
90 sun_partition,
91#endif
92#ifdef CONFIG_AMIGA_PARTITION
93 amiga_partition,
94#endif
95#ifdef CONFIG_ATARI_PARTITION
96 atari_partition,
97#endif
98#ifdef CONFIG_MAC_PARTITION
99 mac_partition,
100#endif
101#ifdef CONFIG_ULTRIX_PARTITION
102 ultrix_partition,
103#endif
104#ifdef CONFIG_IBM_PARTITION
105 ibm_partition,
0e6e1db4
BC
106#endif
107#ifdef CONFIG_KARMA_PARTITION
108 karma_partition,
19d0e8ce
PDM
109#endif
110#ifdef CONFIG_SYSV68_PARTITION
111 sysv68_partition,
1da177e4
LT
112#endif
113 NULL
114};
115
116/*
117 * disk_name() is used by partition check code and the genhd driver.
118 * It formats the devicename of the indicated disk into
119 * the supplied buffer (of size at least 32), and returns
120 * a pointer to that same buffer (for convenience).
121 */
122
cf771cb5 123char *disk_name(struct gendisk *hd, int partno, char *buf)
1da177e4 124{
cf771cb5 125 if (!partno)
1da177e4
LT
126 snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name);
127 else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1]))
cf771cb5 128 snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno);
1da177e4 129 else
cf771cb5 130 snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno);
1da177e4
LT
131
132 return buf;
133}
134
135const char *bdevname(struct block_device *bdev, char *buf)
136{
0762b8bd 137 return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf);
1da177e4
LT
138}
139
140EXPORT_SYMBOL(bdevname);
141
142/*
143 * There's very little reason to use this, you should really
144 * have a struct block_device just about everywhere and use
145 * bdevname() instead.
146 */
147const char *__bdevname(dev_t dev, char *buffer)
148{
149 scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)",
150 MAJOR(dev), MINOR(dev));
151 return buffer;
152}
153
154EXPORT_SYMBOL(__bdevname);
155
156static struct parsed_partitions *
157check_partition(struct gendisk *hd, struct block_device *bdev)
158{
159 struct parsed_partitions *state;
57881dd9 160 int i, res, err;
1da177e4
LT
161
162 state = kmalloc(sizeof(struct parsed_partitions), GFP_KERNEL);
163 if (!state)
164 return NULL;
165
a2964188
GKH
166 disk_name(hd, 0, state->name);
167 printk(KERN_INFO " %s:", state->name);
168 if (isdigit(state->name[strlen(state->name)-1]))
1da177e4 169 sprintf(state->name, "p");
a2964188 170
b5d0b9df 171 state->limit = disk_max_parts(hd);
57881dd9 172 i = res = err = 0;
1da177e4
LT
173 while (!res && check_part[i]) {
174 memset(&state->parts, 0, sizeof(state->parts));
175 res = check_part[i++](state, bdev);
57881dd9
S
176 if (res < 0) {
177 /* We have hit an I/O error which we don't report now.
178 * But record it, and let the others do their job.
179 */
180 err = res;
181 res = 0;
182 }
183
1da177e4
LT
184 }
185 if (res > 0)
186 return state;
9bebff6c 187 if (err)
57881dd9
S
188 /* The partition is unrecognized. So report I/O errors if there were any */
189 res = err;
1da177e4
LT
190 if (!res)
191 printk(" unknown partition table\n");
192 else if (warn_no_part)
193 printk(" unable to read partition table\n");
194 kfree(state);
5127d002 195 return ERR_PTR(res);
1da177e4
LT
196}
197
edfaa7c3
KS
198static ssize_t part_start_show(struct device *dev,
199 struct device_attribute *attr, char *buf)
1da177e4 200{
edfaa7c3 201 struct hd_struct *p = dev_to_part(dev);
a7fd6706 202
edfaa7c3 203 return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);
1da177e4
LT
204}
205
e5610521
TH
206ssize_t part_size_show(struct device *dev,
207 struct device_attribute *attr, char *buf)
a7fd6706 208{
edfaa7c3
KS
209 struct hd_struct *p = dev_to_part(dev);
210 return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects);
a7fd6706 211}
edfaa7c3 212
074a7aca
TH
213ssize_t part_stat_show(struct device *dev,
214 struct device_attribute *attr, char *buf)
1da177e4 215{
edfaa7c3 216 struct hd_struct *p = dev_to_part(dev);
c9959059 217 int cpu;
edfaa7c3 218
074a7aca 219 cpu = part_stat_lock();
c9959059 220 part_round_stats(cpu, p);
074a7aca 221 part_stat_unlock();
34e8beac
JM
222 return sprintf(buf,
223 "%8lu %8lu %8llu %8u "
224 "%8lu %8lu %8llu %8u "
225 "%8u %8u %8u"
226 "\n",
227 part_stat_read(p, ios[READ]),
228 part_stat_read(p, merges[READ]),
229 (unsigned long long)part_stat_read(p, sectors[READ]),
230 jiffies_to_msecs(part_stat_read(p, ticks[READ])),
231 part_stat_read(p, ios[WRITE]),
232 part_stat_read(p, merges[WRITE]),
233 (unsigned long long)part_stat_read(p, sectors[WRITE]),
234 jiffies_to_msecs(part_stat_read(p, ticks[WRITE])),
235 p->in_flight,
236 jiffies_to_msecs(part_stat_read(p, io_ticks)),
237 jiffies_to_msecs(part_stat_read(p, time_in_queue)));
1da177e4 238}
1da177e4 239
c17bb495 240#ifdef CONFIG_FAIL_MAKE_REQUEST
eddb2e26
TH
241ssize_t part_fail_show(struct device *dev,
242 struct device_attribute *attr, char *buf)
edfaa7c3
KS
243{
244 struct hd_struct *p = dev_to_part(dev);
c17bb495 245
edfaa7c3
KS
246 return sprintf(buf, "%d\n", p->make_it_fail);
247}
248
eddb2e26
TH
249ssize_t part_fail_store(struct device *dev,
250 struct device_attribute *attr,
251 const char *buf, size_t count)
c17bb495 252{
edfaa7c3 253 struct hd_struct *p = dev_to_part(dev);
c17bb495
AM
254 int i;
255
256 if (count > 0 && sscanf(buf, "%d", &i) > 0)
257 p->make_it_fail = (i == 0) ? 0 : 1;
258
259 return count;
260}
edfaa7c3 261#endif
c17bb495 262
edfaa7c3
KS
263static DEVICE_ATTR(start, S_IRUGO, part_start_show, NULL);
264static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL);
265static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL);
266#ifdef CONFIG_FAIL_MAKE_REQUEST
267static struct device_attribute dev_attr_fail =
268 __ATTR(make-it-fail, S_IRUGO|S_IWUSR, part_fail_show, part_fail_store);
c17bb495
AM
269#endif
270
edfaa7c3
KS
271static struct attribute *part_attrs[] = {
272 &dev_attr_start.attr,
273 &dev_attr_size.attr,
274 &dev_attr_stat.attr,
c17bb495 275#ifdef CONFIG_FAIL_MAKE_REQUEST
edfaa7c3 276 &dev_attr_fail.attr,
c17bb495 277#endif
edfaa7c3 278 NULL
1da177e4
LT
279};
280
edfaa7c3
KS
281static struct attribute_group part_attr_group = {
282 .attrs = part_attrs,
283};
1da177e4 284
edfaa7c3
KS
285static struct attribute_group *part_attr_groups[] = {
286 &part_attr_group,
287 NULL
288};
289
290static void part_release(struct device *dev)
1da177e4 291{
edfaa7c3 292 struct hd_struct *p = dev_to_part(dev);
6f2576af 293 free_part_stats(p);
1da177e4
LT
294 kfree(p);
295}
296
edfaa7c3
KS
297struct device_type part_type = {
298 .name = "partition",
299 .groups = part_attr_groups,
1da177e4 300 .release = part_release,
1da177e4
LT
301};
302
e71bf0d0
TH
303static void delete_partition_rcu_cb(struct rcu_head *head)
304{
305 struct hd_struct *part = container_of(head, struct hd_struct, rcu_head);
306
307 part->start_sect = 0;
308 part->nr_sects = 0;
309 part_stat_set_all(part, 0);
ed9e1982 310 put_device(part_to_dev(part));
e71bf0d0
TH
311}
312
cf771cb5 313void delete_partition(struct gendisk *disk, int partno)
1da177e4 314{
540eed56 315 struct disk_part_tbl *ptbl = disk->part_tbl;
e71bf0d0 316 struct hd_struct *part;
edfaa7c3 317
540eed56
TH
318 if (partno >= ptbl->len)
319 return;
320
321 part = ptbl->part[partno];
e71bf0d0 322 if (!part)
1da177e4 323 return;
e71bf0d0 324
bcce3de1 325 blk_free_devt(part_devt(part));
540eed56 326 rcu_assign_pointer(ptbl->part[partno], NULL);
e71bf0d0 327 kobject_put(part->holder_dir);
ed9e1982 328 device_del(part_to_dev(part));
e71bf0d0
TH
329
330 call_rcu(&part->rcu_head, delete_partition_rcu_cb);
1da177e4
LT
331}
332
f4a00a2c
GKH
333static ssize_t whole_disk_show(struct device *dev,
334 struct device_attribute *attr, char *buf)
335{
336 return 0;
337}
338static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH,
339 whole_disk_show, NULL);
340
cf771cb5
TH
341int add_partition(struct gendisk *disk, int partno,
342 sector_t start, sector_t len, int flags)
1da177e4
LT
343{
344 struct hd_struct *p;
bcce3de1 345 dev_t devt = MKDEV(0, 0);
ed9e1982
TH
346 struct device *ddev = disk_to_dev(disk);
347 struct device *pdev;
540eed56 348 struct disk_part_tbl *ptbl;
ed9e1982 349 const char *dname;
edfaa7c3 350 int err;
1da177e4 351
540eed56
TH
352 err = disk_expand_part_tbl(disk, partno);
353 if (err)
354 return err;
355 ptbl = disk->part_tbl;
356
357 if (ptbl->part[partno])
88e34126
TH
358 return -EBUSY;
359
dd00cc48 360 p = kzalloc(sizeof(*p), GFP_KERNEL);
1da177e4 361 if (!p)
d805dda4 362 return -ENOMEM;
edfaa7c3 363
6f2576af 364 if (!init_part_stats(p)) {
d805dda4 365 err = -ENOMEM;
88e34126 366 goto out_free;
6f2576af 367 }
ed9e1982
TH
368 pdev = part_to_dev(p);
369
1da177e4
LT
370 p->start_sect = start;
371 p->nr_sects = len;
cf771cb5 372 p->partno = partno;
b7db9956 373 p->policy = get_disk_ro(disk);
1da177e4 374
ed9e1982
TH
375 dname = dev_name(ddev);
376 if (isdigit(dname[strlen(dname) - 1]))
377 snprintf(pdev->bus_id, BUS_ID_SIZE, "%sp%d", dname, partno);
1da177e4 378 else
ed9e1982 379 snprintf(pdev->bus_id, BUS_ID_SIZE, "%s%d", dname, partno);
edfaa7c3 380
ed9e1982
TH
381 device_initialize(pdev);
382 pdev->class = &block_class;
383 pdev->type = &part_type;
384 pdev->parent = ddev;
edfaa7c3 385
bcce3de1
TH
386 err = blk_alloc_devt(p, &devt);
387 if (err)
ed9e1982
TH
388 goto out_free;
389 pdev->devt = devt;
bcce3de1 390
edfaa7c3 391 /* delay uevent until 'holders' subdir is created */
ed9e1982
TH
392 pdev->uevent_suppress = 1;
393 err = device_add(pdev);
d805dda4 394 if (err)
88e34126
TH
395 goto out_put;
396
397 err = -ENOMEM;
ed9e1982 398 p->holder_dir = kobject_create_and_add("holders", &pdev->kobj);
88e34126
TH
399 if (!p->holder_dir)
400 goto out_del;
401
ed9e1982 402 pdev->uevent_suppress = 0;
d805dda4 403 if (flags & ADDPART_FLAG_WHOLEDISK) {
ed9e1982 404 err = device_create_file(pdev, &dev_attr_whole_disk);
d805dda4 405 if (err)
88e34126 406 goto out_del;
d805dda4 407 }
1da177e4 408
88e34126 409 /* everything is up and running, commence */
e71bf0d0 410 INIT_RCU_HEAD(&p->rcu_head);
540eed56 411 rcu_assign_pointer(ptbl->part[partno], p);
88e34126 412
edfaa7c3 413 /* suppress uevent if the disk supresses it */
ed9e1982
TH
414 if (!ddev->uevent_suppress)
415 kobject_uevent(&pdev->kobj, KOBJ_ADD);
d805dda4
AB
416
417 return 0;
418
88e34126
TH
419out_free:
420 kfree(p);
421 return err;
422out_del:
423 kobject_put(p->holder_dir);
ed9e1982 424 device_del(pdev);
88e34126 425out_put:
ed9e1982 426 put_device(pdev);
bcce3de1 427 blk_free_devt(devt);
d805dda4 428 return err;
1da177e4
LT
429}
430
431/* Not exported, helper to add_disk(). */
432void register_disk(struct gendisk *disk)
433{
ed9e1982 434 struct device *ddev = disk_to_dev(disk);
1da177e4 435 struct block_device *bdev;
e71bf0d0
TH
436 struct disk_part_iter piter;
437 struct hd_struct *part;
1da177e4
LT
438 char *s;
439 int err;
440
ed9e1982 441 ddev->parent = disk->driverfs_dev;
edfaa7c3 442
ed9e1982 443 strlcpy(ddev->bus_id, disk->disk_name, BUS_ID_SIZE);
edfaa7c3 444 /* ewww... some of these buggers have / in the name... */
ed9e1982 445 s = strchr(ddev->bus_id, '/');
1da177e4
LT
446 if (s)
447 *s = '!';
edfaa7c3
KS
448
449 /* delay uevents, until we scanned partition table */
ed9e1982 450 ddev->uevent_suppress = 1;
edfaa7c3 451
ed9e1982 452 if (device_add(ddev))
1da177e4 453 return;
edfaa7c3 454#ifndef CONFIG_SYSFS_DEPRECATED
ed9e1982
TH
455 err = sysfs_create_link(block_depr, &ddev->kobj,
456 kobject_name(&ddev->kobj));
eee44cca 457 if (err) {
ed9e1982 458 device_del(ddev);
eee44cca
JG
459 return;
460 }
edfaa7c3 461#endif
4c46501d
TH
462 disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
463 disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
1da177e4
LT
464
465 /* No minors to use for partitions */
b5d0b9df 466 if (!disk_partitionable(disk))
d4d7e5df 467 goto exit;
1da177e4
LT
468
469 /* No such device (e.g., media were just removed) */
470 if (!get_capacity(disk))
d4d7e5df 471 goto exit;
1da177e4
LT
472
473 bdev = bdget_disk(disk, 0);
474 if (!bdev)
d4d7e5df 475 goto exit;
1da177e4
LT
476
477 bdev->bd_invalidated = 1;
d4d7e5df 478 err = blkdev_get(bdev, FMODE_READ, 0);
d4d7e5df
KS
479 if (err < 0)
480 goto exit;
1da177e4 481 blkdev_put(bdev);
d4d7e5df
KS
482
483exit:
edfaa7c3 484 /* announce disk after possible partitions are created */
ed9e1982
TH
485 ddev->uevent_suppress = 0;
486 kobject_uevent(&ddev->kobj, KOBJ_ADD);
d4d7e5df
KS
487
488 /* announce possible partitions */
e71bf0d0
TH
489 disk_part_iter_init(&piter, disk, 0);
490 while ((part = disk_part_iter_next(&piter)))
ed9e1982 491 kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD);
e71bf0d0 492 disk_part_iter_exit(&piter);
1da177e4
LT
493}
494
495int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
496{
e71bf0d0
TH
497 struct disk_part_iter piter;
498 struct hd_struct *part;
1da177e4 499 struct parsed_partitions *state;
540eed56 500 int p, highest, res;
1da177e4
LT
501
502 if (bdev->bd_part_count)
503 return -EBUSY;
504 res = invalidate_partition(disk, 0);
505 if (res)
506 return res;
e71bf0d0
TH
507
508 disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
509 while ((part = disk_part_iter_next(&piter)))
510 delete_partition(disk, part->partno);
511 disk_part_iter_exit(&piter);
512
1da177e4
LT
513 if (disk->fops->revalidate_disk)
514 disk->fops->revalidate_disk(disk);
9bc3ffbf
AP
515 check_disk_size_change(disk, bdev);
516 bdev->bd_invalidated = 0;
1da177e4
LT
517 if (!get_capacity(disk) || !(state = check_partition(disk, bdev)))
518 return 0;
5127d002 519 if (IS_ERR(state)) /* I/O error reading the partition table */
b74a2f09 520 return -EIO;
6bcf19d0
KS
521
522 /* tell userspace that the media / partition table may have changed */
ed9e1982 523 kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
6bcf19d0 524
540eed56
TH
525 /* Detect the highest partition number and preallocate
526 * disk->part_tbl. This is an optimization and not strictly
527 * necessary.
528 */
529 for (p = 1, highest = 0; p < state->limit; p++)
530 if (state->parts[p].size)
531 highest = p;
532
533 disk_expand_part_tbl(disk, highest);
534
535 /* add partitions */
1da177e4
LT
536 for (p = 1; p < state->limit; p++) {
537 sector_t size = state->parts[p].size;
538 sector_t from = state->parts[p].from;
539 if (!size)
540 continue;
98bd34ea 541 if (from + size > get_capacity(disk)) {
8d99f83b
AM
542 printk(KERN_WARNING
543 "%s: p%d exceeds device capacity\n",
98bd34ea 544 disk->disk_name, p);
04ebd4ae
AB
545 }
546 res = add_partition(disk, p, from, size, state->parts[p].flags);
547 if (res) {
548 printk(KERN_ERR " %s: p%d could not be added: %d\n",
549 disk->disk_name, p, -res);
550 continue;
98bd34ea 551 }
1da177e4 552#ifdef CONFIG_BLK_DEV_MD
d18d7682 553 if (state->parts[p].flags & ADDPART_FLAG_RAID)
1da177e4
LT
554 md_autodetect_dev(bdev->bd_dev+p);
555#endif
556 }
557 kfree(state);
558 return 0;
559}
560
561unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
562{
563 struct address_space *mapping = bdev->bd_inode->i_mapping;
564 struct page *page;
565
090d2b18
PE
566 page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),
567 NULL);
1da177e4 568 if (!IS_ERR(page)) {
1da177e4
LT
569 if (PageError(page))
570 goto fail;
571 p->v = page;
572 return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9);
573fail:
574 page_cache_release(page);
575 }
576 p->v = NULL;
577 return NULL;
578}
579
580EXPORT_SYMBOL(read_dev_sector);
581
582void del_gendisk(struct gendisk *disk)
583{
e71bf0d0
TH
584 struct disk_part_iter piter;
585 struct hd_struct *part;
1da177e4
LT
586
587 /* invalidate stuff */
e71bf0d0
TH
588 disk_part_iter_init(&piter, disk,
589 DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);
590 while ((part = disk_part_iter_next(&piter))) {
591 invalidate_partition(disk, part->partno);
592 delete_partition(disk, part->partno);
1da177e4 593 }
e71bf0d0
TH
594 disk_part_iter_exit(&piter);
595
1da177e4 596 invalidate_partition(disk, 0);
3e1a7ff8 597 blk_free_devt(disk_to_dev(disk)->devt);
80795aef 598 set_capacity(disk, 0);
1da177e4
LT
599 disk->flags &= ~GENHD_FL_UP;
600 unlink_gendisk(disk);
074a7aca
TH
601 part_stat_set_all(&disk->part0, 0);
602 disk->part0.stamp = 0;
1da177e4 603
4c46501d 604 kobject_put(disk->part0.holder_dir);
197b12d6 605 kobject_put(disk->slave_dir);
edfaa7c3
KS
606 disk->driverfs_dev = NULL;
607#ifndef CONFIG_SYSFS_DEPRECATED
ed9e1982 608 sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk)));
edfaa7c3 609#endif
ed9e1982 610 device_del(disk_to_dev(disk));
1da177e4 611}