Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 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> |
Jerome Marchand | 6f2576af | 2008-02-08 11:04:35 +0100 | [diff] [blame] | 21 | #include <linux/genhd.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 22 | |
| 23 | #include "check.h" |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 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" |
Bob Copeland | 0e6e1db | 2006-01-16 22:14:20 -0800 | [diff] [blame] | 37 | #include "karma.h" |
Philippe De Muyter | 19d0e8c | 2007-05-08 00:29:15 -0700 | [diff] [blame] | 38 | #include "sysv68.h" |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 39 | |
| 40 | #ifdef CONFIG_BLK_DEV_MD |
| 41 | extern void md_autodetect_dev(dev_t dev); |
| 42 | #endif |
| 43 | |
| 44 | int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/ |
| 45 | |
| 46 | static 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 |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 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, |
| 106 | #endif |
Bob Copeland | 0e6e1db | 2006-01-16 22:14:20 -0800 | [diff] [blame] | 107 | #ifdef CONFIG_KARMA_PARTITION |
| 108 | karma_partition, |
| 109 | #endif |
Philippe De Muyter | 19d0e8c | 2007-05-08 00:29:15 -0700 | [diff] [blame] | 110 | #ifdef CONFIG_SYSV68_PARTITION |
| 111 | sysv68_partition, |
| 112 | #endif |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 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 | |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 123 | char *disk_name(struct gendisk *hd, int partno, char *buf) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 124 | { |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 125 | if (!partno) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 126 | snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name); |
| 127 | else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 128 | snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 129 | else |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 130 | snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 131 | |
| 132 | return buf; |
| 133 | } |
| 134 | |
| 135 | const char *bdevname(struct block_device *bdev, char *buf) |
| 136 | { |
Tejun Heo | f331c02 | 2008-09-03 09:01:48 +0200 | [diff] [blame] | 137 | int partno = 0; |
| 138 | |
| 139 | if (bdev->bd_part) |
| 140 | partno = bdev->bd_part->partno; |
| 141 | |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 142 | return disk_name(bdev->bd_disk, partno, buf); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 143 | } |
| 144 | |
| 145 | EXPORT_SYMBOL(bdevname); |
| 146 | |
| 147 | /* |
| 148 | * There's very little reason to use this, you should really |
| 149 | * have a struct block_device just about everywhere and use |
| 150 | * bdevname() instead. |
| 151 | */ |
| 152 | const char *__bdevname(dev_t dev, char *buffer) |
| 153 | { |
| 154 | scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)", |
| 155 | MAJOR(dev), MINOR(dev)); |
| 156 | return buffer; |
| 157 | } |
| 158 | |
| 159 | EXPORT_SYMBOL(__bdevname); |
| 160 | |
| 161 | static struct parsed_partitions * |
| 162 | check_partition(struct gendisk *hd, struct block_device *bdev) |
| 163 | { |
| 164 | struct parsed_partitions *state; |
Suzuki K P | 57881dd | 2006-12-06 20:35:16 -0800 | [diff] [blame] | 165 | int i, res, err; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 166 | |
| 167 | state = kmalloc(sizeof(struct parsed_partitions), GFP_KERNEL); |
| 168 | if (!state) |
| 169 | return NULL; |
| 170 | |
Greg Kroah-Hartman | a296418 | 2005-06-20 21:15:16 -0700 | [diff] [blame] | 171 | disk_name(hd, 0, state->name); |
| 172 | printk(KERN_INFO " %s:", state->name); |
| 173 | if (isdigit(state->name[strlen(state->name)-1])) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 174 | sprintf(state->name, "p"); |
Greg Kroah-Hartman | a296418 | 2005-06-20 21:15:16 -0700 | [diff] [blame] | 175 | |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 176 | state->limit = disk_max_parts(hd); |
Suzuki K P | 57881dd | 2006-12-06 20:35:16 -0800 | [diff] [blame] | 177 | i = res = err = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 178 | while (!res && check_part[i]) { |
| 179 | memset(&state->parts, 0, sizeof(state->parts)); |
| 180 | res = check_part[i++](state, bdev); |
Suzuki K P | 57881dd | 2006-12-06 20:35:16 -0800 | [diff] [blame] | 181 | if (res < 0) { |
| 182 | /* We have hit an I/O error which we don't report now. |
| 183 | * But record it, and let the others do their job. |
| 184 | */ |
| 185 | err = res; |
| 186 | res = 0; |
| 187 | } |
| 188 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 189 | } |
| 190 | if (res > 0) |
| 191 | return state; |
suzuki | 9bebff6 | 2007-03-07 20:41:24 -0800 | [diff] [blame] | 192 | if (err) |
Suzuki K P | 57881dd | 2006-12-06 20:35:16 -0800 | [diff] [blame] | 193 | /* The partition is unrecognized. So report I/O errors if there were any */ |
| 194 | res = err; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 195 | if (!res) |
| 196 | printk(" unknown partition table\n"); |
| 197 | else if (warn_no_part) |
| 198 | printk(" unable to read partition table\n"); |
| 199 | kfree(state); |
Suzuki Kp | 5127d00 | 2006-12-06 20:35:14 -0800 | [diff] [blame] | 200 | return ERR_PTR(res); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 201 | } |
| 202 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 203 | static ssize_t part_start_show(struct device *dev, |
| 204 | struct device_attribute *attr, char *buf) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 205 | { |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 206 | struct hd_struct *p = dev_to_part(dev); |
Kay Sievers | a7fd670 | 2005-10-01 14:49:43 +0200 | [diff] [blame] | 207 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 208 | return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 209 | } |
| 210 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 211 | static ssize_t part_size_show(struct device *dev, |
| 212 | struct device_attribute *attr, char *buf) |
| 213 | { |
| 214 | struct hd_struct *p = dev_to_part(dev); |
| 215 | return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects); |
| 216 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 217 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 218 | static ssize_t part_stat_show(struct device *dev, |
| 219 | struct device_attribute *attr, char *buf) |
Kay Sievers | a7fd670 | 2005-10-01 14:49:43 +0200 | [diff] [blame] | 220 | { |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 221 | struct hd_struct *p = dev_to_part(dev); |
Tejun Heo | c995905 | 2008-08-25 19:47:21 +0900 | [diff] [blame] | 222 | int cpu; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 223 | |
Tejun Heo | c995905 | 2008-08-25 19:47:21 +0900 | [diff] [blame] | 224 | cpu = disk_stat_lock(); |
| 225 | part_round_stats(cpu, p); |
| 226 | disk_stat_unlock(); |
Jerome Marchand | 34e8bea | 2008-02-08 11:04:55 +0100 | [diff] [blame] | 227 | return sprintf(buf, |
| 228 | "%8lu %8lu %8llu %8u " |
| 229 | "%8lu %8lu %8llu %8u " |
| 230 | "%8u %8u %8u" |
| 231 | "\n", |
| 232 | part_stat_read(p, ios[READ]), |
| 233 | part_stat_read(p, merges[READ]), |
| 234 | (unsigned long long)part_stat_read(p, sectors[READ]), |
| 235 | jiffies_to_msecs(part_stat_read(p, ticks[READ])), |
| 236 | part_stat_read(p, ios[WRITE]), |
| 237 | part_stat_read(p, merges[WRITE]), |
| 238 | (unsigned long long)part_stat_read(p, sectors[WRITE]), |
| 239 | jiffies_to_msecs(part_stat_read(p, ticks[WRITE])), |
| 240 | p->in_flight, |
| 241 | jiffies_to_msecs(part_stat_read(p, io_ticks)), |
| 242 | jiffies_to_msecs(part_stat_read(p, time_in_queue))); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 243 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 244 | |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 245 | #ifdef CONFIG_FAIL_MAKE_REQUEST |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 246 | static ssize_t part_fail_show(struct device *dev, |
| 247 | struct device_attribute *attr, char *buf) |
| 248 | { |
| 249 | struct hd_struct *p = dev_to_part(dev); |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 250 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 251 | return sprintf(buf, "%d\n", p->make_it_fail); |
| 252 | } |
| 253 | |
| 254 | static ssize_t part_fail_store(struct device *dev, |
| 255 | struct device_attribute *attr, |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 256 | const char *buf, size_t count) |
| 257 | { |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 258 | struct hd_struct *p = dev_to_part(dev); |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 259 | int i; |
| 260 | |
| 261 | if (count > 0 && sscanf(buf, "%d", &i) > 0) |
| 262 | p->make_it_fail = (i == 0) ? 0 : 1; |
| 263 | |
| 264 | return count; |
| 265 | } |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 266 | #endif |
| 267 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 268 | static DEVICE_ATTR(start, S_IRUGO, part_start_show, NULL); |
| 269 | static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL); |
| 270 | static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL); |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 271 | #ifdef CONFIG_FAIL_MAKE_REQUEST |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 272 | static struct device_attribute dev_attr_fail = |
| 273 | __ATTR(make-it-fail, S_IRUGO|S_IWUSR, part_fail_show, part_fail_store); |
Akinobu Mita | c17bb49 | 2006-12-08 02:39:46 -0800 | [diff] [blame] | 274 | #endif |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 275 | |
| 276 | static struct attribute *part_attrs[] = { |
| 277 | &dev_attr_start.attr, |
| 278 | &dev_attr_size.attr, |
| 279 | &dev_attr_stat.attr, |
| 280 | #ifdef CONFIG_FAIL_MAKE_REQUEST |
| 281 | &dev_attr_fail.attr, |
| 282 | #endif |
| 283 | NULL |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 284 | }; |
| 285 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 286 | static struct attribute_group part_attr_group = { |
| 287 | .attrs = part_attrs, |
| 288 | }; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 289 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 290 | static struct attribute_group *part_attr_groups[] = { |
| 291 | &part_attr_group, |
| 292 | NULL |
| 293 | }; |
| 294 | |
| 295 | static void part_release(struct device *dev) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 296 | { |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 297 | struct hd_struct *p = dev_to_part(dev); |
Jerome Marchand | 6f2576af | 2008-02-08 11:04:35 +0100 | [diff] [blame] | 298 | free_part_stats(p); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 299 | kfree(p); |
| 300 | } |
| 301 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 302 | struct device_type part_type = { |
| 303 | .name = "partition", |
| 304 | .groups = part_attr_groups, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 305 | .release = part_release, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 306 | }; |
| 307 | |
Jun'ichi Nomura | 6a4d44c | 2006-03-27 01:17:55 -0800 | [diff] [blame] | 308 | static inline void disk_sysfs_add_subdirs(struct gendisk *disk) |
| 309 | { |
| 310 | struct kobject *k; |
| 311 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 312 | k = kobject_get(&disk_to_dev(disk)->kobj); |
Greg Kroah-Hartman | 4ff6abf | 2007-11-05 22:24:43 -0800 | [diff] [blame] | 313 | disk->holder_dir = kobject_create_and_add("holders", k); |
| 314 | disk->slave_dir = kobject_create_and_add("slaves", k); |
Jun'ichi Nomura | 6a4d44c | 2006-03-27 01:17:55 -0800 | [diff] [blame] | 315 | kobject_put(k); |
| 316 | } |
Jun'ichi Nomura | 6a4d44c | 2006-03-27 01:17:55 -0800 | [diff] [blame] | 317 | |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 318 | static void delete_partition_rcu_cb(struct rcu_head *head) |
| 319 | { |
| 320 | struct hd_struct *part = container_of(head, struct hd_struct, rcu_head); |
| 321 | |
| 322 | part->start_sect = 0; |
| 323 | part->nr_sects = 0; |
| 324 | part_stat_set_all(part, 0); |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 325 | put_device(part_to_dev(part)); |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 326 | } |
| 327 | |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 328 | void delete_partition(struct gendisk *disk, int partno) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 329 | { |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 330 | struct hd_struct *part; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 331 | |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 332 | part = disk->__part[partno]; |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 333 | if (!part) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 334 | return; |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 335 | |
Tejun Heo | bcce3de | 2008-08-25 19:47:22 +0900 | [diff] [blame] | 336 | blk_free_devt(part_devt(part)); |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 337 | rcu_assign_pointer(disk->__part[partno], NULL); |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 338 | kobject_put(part->holder_dir); |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 339 | device_del(part_to_dev(part)); |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 340 | |
| 341 | call_rcu(&part->rcu_head, delete_partition_rcu_cb); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 342 | } |
| 343 | |
Greg Kroah-Hartman | f4a00a2 | 2008-02-06 23:33:39 -0800 | [diff] [blame] | 344 | static ssize_t whole_disk_show(struct device *dev, |
| 345 | struct device_attribute *attr, char *buf) |
| 346 | { |
| 347 | return 0; |
| 348 | } |
| 349 | static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH, |
| 350 | whole_disk_show, NULL); |
| 351 | |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 352 | int add_partition(struct gendisk *disk, int partno, |
| 353 | sector_t start, sector_t len, int flags) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 354 | { |
| 355 | struct hd_struct *p; |
Tejun Heo | bcce3de | 2008-08-25 19:47:22 +0900 | [diff] [blame] | 356 | dev_t devt = MKDEV(0, 0); |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 357 | struct device *ddev = disk_to_dev(disk); |
| 358 | struct device *pdev; |
| 359 | const char *dname; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 360 | int err; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 361 | |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 362 | if (disk->__part[partno]) |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 363 | return -EBUSY; |
| 364 | |
Yoann Padioleau | dd00cc4 | 2007-07-19 01:49:03 -0700 | [diff] [blame] | 365 | p = kzalloc(sizeof(*p), GFP_KERNEL); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 366 | if (!p) |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 367 | return -ENOMEM; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 368 | |
Jerome Marchand | 6f2576af | 2008-02-08 11:04:35 +0100 | [diff] [blame] | 369 | if (!init_part_stats(p)) { |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 370 | err = -ENOMEM; |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 371 | goto out_free; |
Jerome Marchand | 6f2576af | 2008-02-08 11:04:35 +0100 | [diff] [blame] | 372 | } |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 373 | pdev = part_to_dev(p); |
| 374 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 375 | p->start_sect = start; |
| 376 | p->nr_sects = len; |
Tejun Heo | cf771cb | 2008-09-03 09:01:09 +0200 | [diff] [blame] | 377 | p->partno = partno; |
Peter Oberparleiter | 25e206b | 2006-07-10 04:44:00 -0700 | [diff] [blame] | 378 | p->policy = disk->policy; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 379 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 380 | dname = dev_name(ddev); |
| 381 | if (isdigit(dname[strlen(dname) - 1])) |
| 382 | snprintf(pdev->bus_id, BUS_ID_SIZE, "%sp%d", dname, partno); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 383 | else |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 384 | snprintf(pdev->bus_id, BUS_ID_SIZE, "%s%d", dname, partno); |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 385 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 386 | device_initialize(pdev); |
| 387 | pdev->class = &block_class; |
| 388 | pdev->type = &part_type; |
| 389 | pdev->parent = ddev; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 390 | |
Tejun Heo | bcce3de | 2008-08-25 19:47:22 +0900 | [diff] [blame] | 391 | err = blk_alloc_devt(p, &devt); |
| 392 | if (err) |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 393 | goto out_free; |
| 394 | pdev->devt = devt; |
Tejun Heo | bcce3de | 2008-08-25 19:47:22 +0900 | [diff] [blame] | 395 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 396 | /* delay uevent until 'holders' subdir is created */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 397 | pdev->uevent_suppress = 1; |
| 398 | err = device_add(pdev); |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 399 | if (err) |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 400 | goto out_put; |
| 401 | |
| 402 | err = -ENOMEM; |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 403 | p->holder_dir = kobject_create_and_add("holders", &pdev->kobj); |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 404 | if (!p->holder_dir) |
| 405 | goto out_del; |
| 406 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 407 | pdev->uevent_suppress = 0; |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 408 | if (flags & ADDPART_FLAG_WHOLEDISK) { |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 409 | err = device_create_file(pdev, &dev_attr_whole_disk); |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 410 | if (err) |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 411 | goto out_del; |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 412 | } |
Jeff Garzik | eee44cc | 2006-10-17 00:10:23 -0700 | [diff] [blame] | 413 | |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 414 | /* everything is up and running, commence */ |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 415 | INIT_RCU_HEAD(&p->rcu_head); |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 416 | rcu_assign_pointer(disk->__part[partno], p); |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 417 | |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 418 | /* suppress uevent if the disk supresses it */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 419 | if (!ddev->uevent_suppress) |
| 420 | kobject_uevent(&pdev->kobj, KOBJ_ADD); |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 421 | |
| 422 | return 0; |
| 423 | |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 424 | out_free: |
Abdel Benamrouche | d805dda | 2008-07-25 01:48:25 -0700 | [diff] [blame] | 425 | kfree(p); |
| 426 | return err; |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 427 | out_del: |
| 428 | kobject_put(p->holder_dir); |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 429 | device_del(pdev); |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 430 | out_put: |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 431 | put_device(pdev); |
Tejun Heo | bcce3de | 2008-08-25 19:47:22 +0900 | [diff] [blame] | 432 | blk_free_devt(devt); |
Tejun Heo | 88e3412 | 2008-08-25 19:30:16 +0900 | [diff] [blame] | 433 | return err; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 434 | } |
| 435 | |
| 436 | /* Not exported, helper to add_disk(). */ |
| 437 | void register_disk(struct gendisk *disk) |
| 438 | { |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 439 | struct device *ddev = disk_to_dev(disk); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 440 | struct block_device *bdev; |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 441 | struct disk_part_iter piter; |
| 442 | struct hd_struct *part; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 443 | char *s; |
| 444 | int err; |
| 445 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 446 | ddev->parent = disk->driverfs_dev; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 447 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 448 | strlcpy(ddev->bus_id, disk->disk_name, BUS_ID_SIZE); |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 449 | /* ewww... some of these buggers have / in the name... */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 450 | s = strchr(ddev->bus_id, '/'); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 451 | if (s) |
| 452 | *s = '!'; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 453 | |
| 454 | /* delay uevents, until we scanned partition table */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 455 | ddev->uevent_suppress = 1; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 456 | |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 457 | if (device_add(ddev)) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 458 | return; |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 459 | #ifndef CONFIG_SYSFS_DEPRECATED |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 460 | err = sysfs_create_link(block_depr, &ddev->kobj, |
| 461 | kobject_name(&ddev->kobj)); |
Jeff Garzik | eee44cc | 2006-10-17 00:10:23 -0700 | [diff] [blame] | 462 | if (err) { |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 463 | device_del(ddev); |
Jeff Garzik | eee44cc | 2006-10-17 00:10:23 -0700 | [diff] [blame] | 464 | return; |
| 465 | } |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 466 | #endif |
| 467 | disk_sysfs_add_subdirs(disk); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 468 | |
| 469 | /* No minors to use for partitions */ |
Tejun Heo | b5d0b9d | 2008-09-03 09:06:42 +0200 | [diff] [blame^] | 470 | if (!disk_partitionable(disk)) |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 471 | goto exit; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 472 | |
| 473 | /* No such device (e.g., media were just removed) */ |
| 474 | if (!get_capacity(disk)) |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 475 | goto exit; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 476 | |
| 477 | bdev = bdget_disk(disk, 0); |
| 478 | if (!bdev) |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 479 | goto exit; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 480 | |
| 481 | bdev->bd_invalidated = 1; |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 482 | err = blkdev_get(bdev, FMODE_READ, 0); |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 483 | if (err < 0) |
| 484 | goto exit; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 485 | blkdev_put(bdev); |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 486 | |
| 487 | exit: |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 488 | /* announce disk after possible partitions are created */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 489 | ddev->uevent_suppress = 0; |
| 490 | kobject_uevent(&ddev->kobj, KOBJ_ADD); |
Kay Sievers | d4d7e5d | 2006-03-24 20:45:35 +0100 | [diff] [blame] | 491 | |
| 492 | /* announce possible partitions */ |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 493 | disk_part_iter_init(&piter, disk, 0); |
| 494 | while ((part = disk_part_iter_next(&piter))) |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 495 | kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD); |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 496 | disk_part_iter_exit(&piter); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | int rescan_partitions(struct gendisk *disk, struct block_device *bdev) |
| 500 | { |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 501 | struct disk_part_iter piter; |
| 502 | struct hd_struct *part; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 503 | struct parsed_partitions *state; |
| 504 | int p, res; |
| 505 | |
| 506 | if (bdev->bd_part_count) |
| 507 | return -EBUSY; |
| 508 | res = invalidate_partition(disk, 0); |
| 509 | if (res) |
| 510 | return res; |
| 511 | bdev->bd_invalidated = 0; |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 512 | |
| 513 | disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); |
| 514 | while ((part = disk_part_iter_next(&piter))) |
| 515 | delete_partition(disk, part->partno); |
| 516 | disk_part_iter_exit(&piter); |
| 517 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 518 | if (disk->fops->revalidate_disk) |
| 519 | disk->fops->revalidate_disk(disk); |
| 520 | if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) |
| 521 | return 0; |
Suzuki Kp | 5127d00 | 2006-12-06 20:35:14 -0800 | [diff] [blame] | 522 | if (IS_ERR(state)) /* I/O error reading the partition table */ |
suzuki | b74a2f0 | 2007-03-16 13:38:25 -0800 | [diff] [blame] | 523 | return -EIO; |
Kay Sievers | 6bcf19d | 2008-03-09 21:26:02 +0100 | [diff] [blame] | 524 | |
| 525 | /* tell userspace that the media / partition table may have changed */ |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 526 | kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE); |
Kay Sievers | 6bcf19d | 2008-03-09 21:26:02 +0100 | [diff] [blame] | 527 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 528 | for (p = 1; p < state->limit; p++) { |
| 529 | sector_t size = state->parts[p].size; |
| 530 | sector_t from = state->parts[p].from; |
| 531 | if (!size) |
| 532 | continue; |
Mike Miller | 98bd34e | 2006-06-23 02:06:07 -0700 | [diff] [blame] | 533 | if (from + size > get_capacity(disk)) { |
Andrew Morton | 8d99f83 | 2008-09-13 02:33:25 -0700 | [diff] [blame] | 534 | printk(KERN_WARNING |
| 535 | "%s: p%d exceeds device capacity\n", |
Mike Miller | 98bd34e | 2006-06-23 02:06:07 -0700 | [diff] [blame] | 536 | disk->disk_name, p); |
| 537 | } |
Abdel Benamrouche | 04ebd4a | 2008-07-25 01:48:26 -0700 | [diff] [blame] | 538 | res = add_partition(disk, p, from, size, state->parts[p].flags); |
| 539 | if (res) { |
| 540 | printk(KERN_ERR " %s: p%d could not be added: %d\n", |
| 541 | disk->disk_name, p, -res); |
| 542 | continue; |
| 543 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 544 | #ifdef CONFIG_BLK_DEV_MD |
Fabio Massimo Di Nitto | d18d768 | 2007-02-10 23:50:00 -0800 | [diff] [blame] | 545 | if (state->parts[p].flags & ADDPART_FLAG_RAID) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 546 | md_autodetect_dev(bdev->bd_dev+p); |
| 547 | #endif |
| 548 | } |
| 549 | kfree(state); |
| 550 | return 0; |
| 551 | } |
| 552 | |
| 553 | unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) |
| 554 | { |
| 555 | struct address_space *mapping = bdev->bd_inode->i_mapping; |
| 556 | struct page *page; |
| 557 | |
Pekka Enberg | 090d2b1 | 2006-06-23 02:05:08 -0700 | [diff] [blame] | 558 | page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), |
| 559 | NULL); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 560 | if (!IS_ERR(page)) { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 561 | if (PageError(page)) |
| 562 | goto fail; |
| 563 | p->v = page; |
| 564 | return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9); |
| 565 | fail: |
| 566 | page_cache_release(page); |
| 567 | } |
| 568 | p->v = NULL; |
| 569 | return NULL; |
| 570 | } |
| 571 | |
| 572 | EXPORT_SYMBOL(read_dev_sector); |
| 573 | |
| 574 | void del_gendisk(struct gendisk *disk) |
| 575 | { |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 576 | struct disk_part_iter piter; |
| 577 | struct hd_struct *part; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 578 | |
| 579 | /* invalidate stuff */ |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 580 | disk_part_iter_init(&piter, disk, |
| 581 | DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE); |
| 582 | while ((part = disk_part_iter_next(&piter))) { |
| 583 | invalidate_partition(disk, part->partno); |
| 584 | delete_partition(disk, part->partno); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 585 | } |
Tejun Heo | e71bf0d | 2008-09-03 09:03:02 +0200 | [diff] [blame] | 586 | disk_part_iter_exit(&piter); |
| 587 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 588 | invalidate_partition(disk, 0); |
| 589 | disk->capacity = 0; |
| 590 | disk->flags &= ~GENHD_FL_UP; |
| 591 | unlink_gendisk(disk); |
| 592 | disk_stat_set_all(disk, 0); |
Chen, Kenneth W | 20e5c81 | 2005-10-13 21:48:42 +0200 | [diff] [blame] | 593 | disk->stamp = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 594 | |
Greg Kroah-Hartman | 197b12d | 2007-12-20 08:13:05 -0800 | [diff] [blame] | 595 | kobject_put(disk->holder_dir); |
| 596 | kobject_put(disk->slave_dir); |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 597 | disk->driverfs_dev = NULL; |
| 598 | #ifndef CONFIG_SYSFS_DEPRECATED |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 599 | sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); |
Kay Sievers | edfaa7c | 2007-05-21 22:08:01 +0200 | [diff] [blame] | 600 | #endif |
Tejun Heo | ed9e198 | 2008-08-25 19:56:05 +0900 | [diff] [blame] | 601 | device_del(disk_to_dev(disk)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 602 | } |