diff options
-rw-r--r-- | block/Makefile | 2 | ||||
-rw-r--r-- | block/partition-generic.c | 537 | ||||
-rw-r--r-- | block/partitions/check.c | 523 | ||||
-rw-r--r-- | block/partitions/check.h | 3 |
4 files changed, 542 insertions, 523 deletions
diff --git a/block/Makefile b/block/Makefile index 3199c0cdef5a..39b76ba66ffd 100644 --- a/block/Makefile +++ b/block/Makefile | |||
@@ -6,7 +6,7 @@ obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \ | |||
6 | blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ | 6 | blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ |
7 | blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ | 7 | blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ |
8 | blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \ | 8 | blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \ |
9 | partitions/ | 9 | partition-generic.o partitions/ |
10 | 10 | ||
11 | obj-$(CONFIG_BLK_DEV_BSG) += bsg.o | 11 | obj-$(CONFIG_BLK_DEV_BSG) += bsg.o |
12 | obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o | 12 | obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o |
diff --git a/block/partition-generic.c b/block/partition-generic.c new file mode 100644 index 000000000000..d06ec1c829c2 --- /dev/null +++ b/block/partition-generic.c | |||
@@ -0,0 +1,537 @@ | |||
1 | /* | ||
2 | * Code extracted from drivers/block/genhd.c | ||
3 | * Copyright (C) 1991-1998 Linus Torvalds | ||
4 | * Re-organised Feb 1998 Russell King | ||
5 | * | ||
6 | * We now have independent partition support from the | ||
7 | * block drivers, which allows all the partition code to | ||
8 | * be grouped in one location, and it to be mostly self | ||
9 | * contained. | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | #include <linux/module.h> | ||
14 | #include <linux/fs.h> | ||
15 | #include <linux/slab.h> | ||
16 | #include <linux/kmod.h> | ||
17 | #include <linux/ctype.h> | ||
18 | #include <linux/genhd.h> | ||
19 | #include <linux/blktrace_api.h> | ||
20 | |||
21 | #include "partitions/check.h" | ||
22 | |||
23 | #ifdef CONFIG_BLK_DEV_MD | ||
24 | extern void md_autodetect_dev(dev_t dev); | ||
25 | #endif | ||
26 | |||
27 | /* | ||
28 | * disk_name() is used by partition check code and the genhd driver. | ||
29 | * It formats the devicename of the indicated disk into | ||
30 | * the supplied buffer (of size at least 32), and returns | ||
31 | * a pointer to that same buffer (for convenience). | ||
32 | */ | ||
33 | |||
34 | char *disk_name(struct gendisk *hd, int partno, char *buf) | ||
35 | { | ||
36 | if (!partno) | ||
37 | snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name); | ||
38 | else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) | ||
39 | snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno); | ||
40 | else | ||
41 | snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno); | ||
42 | |||
43 | return buf; | ||
44 | } | ||
45 | |||
46 | const char *bdevname(struct block_device *bdev, char *buf) | ||
47 | { | ||
48 | return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf); | ||
49 | } | ||
50 | |||
51 | EXPORT_SYMBOL(bdevname); | ||
52 | |||
53 | /* | ||
54 | * There's very little reason to use this, you should really | ||
55 | * have a struct block_device just about everywhere and use | ||
56 | * bdevname() instead. | ||
57 | */ | ||
58 | const char *__bdevname(dev_t dev, char *buffer) | ||
59 | { | ||
60 | scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)", | ||
61 | MAJOR(dev), MINOR(dev)); | ||
62 | return buffer; | ||
63 | } | ||
64 | |||
65 | EXPORT_SYMBOL(__bdevname); | ||
66 | |||
67 | static ssize_t part_partition_show(struct device *dev, | ||
68 | struct device_attribute *attr, char *buf) | ||
69 | { | ||
70 | struct hd_struct *p = dev_to_part(dev); | ||
71 | |||
72 | return sprintf(buf, "%d\n", p->partno); | ||
73 | } | ||
74 | |||
75 | static ssize_t part_start_show(struct device *dev, | ||
76 | struct device_attribute *attr, char *buf) | ||
77 | { | ||
78 | struct hd_struct *p = dev_to_part(dev); | ||
79 | |||
80 | return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect); | ||
81 | } | ||
82 | |||
83 | ssize_t part_size_show(struct device *dev, | ||
84 | struct device_attribute *attr, char *buf) | ||
85 | { | ||
86 | struct hd_struct *p = dev_to_part(dev); | ||
87 | return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects); | ||
88 | } | ||
89 | |||
90 | static ssize_t part_ro_show(struct device *dev, | ||
91 | struct device_attribute *attr, char *buf) | ||
92 | { | ||
93 | struct hd_struct *p = dev_to_part(dev); | ||
94 | return sprintf(buf, "%d\n", p->policy ? 1 : 0); | ||
95 | } | ||
96 | |||
97 | static ssize_t part_alignment_offset_show(struct device *dev, | ||
98 | struct device_attribute *attr, char *buf) | ||
99 | { | ||
100 | struct hd_struct *p = dev_to_part(dev); | ||
101 | return sprintf(buf, "%llu\n", (unsigned long long)p->alignment_offset); | ||
102 | } | ||
103 | |||
104 | static ssize_t part_discard_alignment_show(struct device *dev, | ||
105 | struct device_attribute *attr, char *buf) | ||
106 | { | ||
107 | struct hd_struct *p = dev_to_part(dev); | ||
108 | return sprintf(buf, "%u\n", p->discard_alignment); | ||
109 | } | ||
110 | |||
111 | ssize_t part_stat_show(struct device *dev, | ||
112 | struct device_attribute *attr, char *buf) | ||
113 | { | ||
114 | struct hd_struct *p = dev_to_part(dev); | ||
115 | int cpu; | ||
116 | |||
117 | cpu = part_stat_lock(); | ||
118 | part_round_stats(cpu, p); | ||
119 | part_stat_unlock(); | ||
120 | return sprintf(buf, | ||
121 | "%8lu %8lu %8llu %8u " | ||
122 | "%8lu %8lu %8llu %8u " | ||
123 | "%8u %8u %8u" | ||
124 | "\n", | ||
125 | part_stat_read(p, ios[READ]), | ||
126 | part_stat_read(p, merges[READ]), | ||
127 | (unsigned long long)part_stat_read(p, sectors[READ]), | ||
128 | jiffies_to_msecs(part_stat_read(p, ticks[READ])), | ||
129 | part_stat_read(p, ios[WRITE]), | ||
130 | part_stat_read(p, merges[WRITE]), | ||
131 | (unsigned long long)part_stat_read(p, sectors[WRITE]), | ||
132 | jiffies_to_msecs(part_stat_read(p, ticks[WRITE])), | ||
133 | part_in_flight(p), | ||
134 | jiffies_to_msecs(part_stat_read(p, io_ticks)), | ||
135 | jiffies_to_msecs(part_stat_read(p, time_in_queue))); | ||
136 | } | ||
137 | |||
138 | ssize_t part_inflight_show(struct device *dev, | ||
139 | struct device_attribute *attr, char *buf) | ||
140 | { | ||
141 | struct hd_struct *p = dev_to_part(dev); | ||
142 | |||
143 | return sprintf(buf, "%8u %8u\n", atomic_read(&p->in_flight[0]), | ||
144 | atomic_read(&p->in_flight[1])); | ||
145 | } | ||
146 | |||
147 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
148 | ssize_t part_fail_show(struct device *dev, | ||
149 | struct device_attribute *attr, char *buf) | ||
150 | { | ||
151 | struct hd_struct *p = dev_to_part(dev); | ||
152 | |||
153 | return sprintf(buf, "%d\n", p->make_it_fail); | ||
154 | } | ||
155 | |||
156 | ssize_t part_fail_store(struct device *dev, | ||
157 | struct device_attribute *attr, | ||
158 | const char *buf, size_t count) | ||
159 | { | ||
160 | struct hd_struct *p = dev_to_part(dev); | ||
161 | int i; | ||
162 | |||
163 | if (count > 0 && sscanf(buf, "%d", &i) > 0) | ||
164 | p->make_it_fail = (i == 0) ? 0 : 1; | ||
165 | |||
166 | return count; | ||
167 | } | ||
168 | #endif | ||
169 | |||
170 | static DEVICE_ATTR(partition, S_IRUGO, part_partition_show, NULL); | ||
171 | static DEVICE_ATTR(start, S_IRUGO, part_start_show, NULL); | ||
172 | static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL); | ||
173 | static DEVICE_ATTR(ro, S_IRUGO, part_ro_show, NULL); | ||
174 | static DEVICE_ATTR(alignment_offset, S_IRUGO, part_alignment_offset_show, NULL); | ||
175 | static DEVICE_ATTR(discard_alignment, S_IRUGO, part_discard_alignment_show, | ||
176 | NULL); | ||
177 | static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL); | ||
178 | static DEVICE_ATTR(inflight, S_IRUGO, part_inflight_show, NULL); | ||
179 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
180 | static struct device_attribute dev_attr_fail = | ||
181 | __ATTR(make-it-fail, S_IRUGO|S_IWUSR, part_fail_show, part_fail_store); | ||
182 | #endif | ||
183 | |||
184 | static struct attribute *part_attrs[] = { | ||
185 | &dev_attr_partition.attr, | ||
186 | &dev_attr_start.attr, | ||
187 | &dev_attr_size.attr, | ||
188 | &dev_attr_ro.attr, | ||
189 | &dev_attr_alignment_offset.attr, | ||
190 | &dev_attr_discard_alignment.attr, | ||
191 | &dev_attr_stat.attr, | ||
192 | &dev_attr_inflight.attr, | ||
193 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
194 | &dev_attr_fail.attr, | ||
195 | #endif | ||
196 | NULL | ||
197 | }; | ||
198 | |||
199 | static struct attribute_group part_attr_group = { | ||
200 | .attrs = part_attrs, | ||
201 | }; | ||
202 | |||
203 | static const struct attribute_group *part_attr_groups[] = { | ||
204 | &part_attr_group, | ||
205 | #ifdef CONFIG_BLK_DEV_IO_TRACE | ||
206 | &blk_trace_attr_group, | ||
207 | #endif | ||
208 | NULL | ||
209 | }; | ||
210 | |||
211 | static void part_release(struct device *dev) | ||
212 | { | ||
213 | struct hd_struct *p = dev_to_part(dev); | ||
214 | free_part_stats(p); | ||
215 | free_part_info(p); | ||
216 | kfree(p); | ||
217 | } | ||
218 | |||
219 | struct device_type part_type = { | ||
220 | .name = "partition", | ||
221 | .groups = part_attr_groups, | ||
222 | .release = part_release, | ||
223 | }; | ||
224 | |||
225 | static void delete_partition_rcu_cb(struct rcu_head *head) | ||
226 | { | ||
227 | struct hd_struct *part = container_of(head, struct hd_struct, rcu_head); | ||
228 | |||
229 | part->start_sect = 0; | ||
230 | part->nr_sects = 0; | ||
231 | part_stat_set_all(part, 0); | ||
232 | put_device(part_to_dev(part)); | ||
233 | } | ||
234 | |||
235 | void __delete_partition(struct hd_struct *part) | ||
236 | { | ||
237 | call_rcu(&part->rcu_head, delete_partition_rcu_cb); | ||
238 | } | ||
239 | |||
240 | void delete_partition(struct gendisk *disk, int partno) | ||
241 | { | ||
242 | struct disk_part_tbl *ptbl = disk->part_tbl; | ||
243 | struct hd_struct *part; | ||
244 | |||
245 | if (partno >= ptbl->len) | ||
246 | return; | ||
247 | |||
248 | part = ptbl->part[partno]; | ||
249 | if (!part) | ||
250 | return; | ||
251 | |||
252 | blk_free_devt(part_devt(part)); | ||
253 | rcu_assign_pointer(ptbl->part[partno], NULL); | ||
254 | rcu_assign_pointer(ptbl->last_lookup, NULL); | ||
255 | kobject_put(part->holder_dir); | ||
256 | device_del(part_to_dev(part)); | ||
257 | |||
258 | hd_struct_put(part); | ||
259 | } | ||
260 | |||
261 | static ssize_t whole_disk_show(struct device *dev, | ||
262 | struct device_attribute *attr, char *buf) | ||
263 | { | ||
264 | return 0; | ||
265 | } | ||
266 | static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH, | ||
267 | whole_disk_show, NULL); | ||
268 | |||
269 | struct hd_struct *add_partition(struct gendisk *disk, int partno, | ||
270 | sector_t start, sector_t len, int flags, | ||
271 | struct partition_meta_info *info) | ||
272 | { | ||
273 | struct hd_struct *p; | ||
274 | dev_t devt = MKDEV(0, 0); | ||
275 | struct device *ddev = disk_to_dev(disk); | ||
276 | struct device *pdev; | ||
277 | struct disk_part_tbl *ptbl; | ||
278 | const char *dname; | ||
279 | int err; | ||
280 | |||
281 | err = disk_expand_part_tbl(disk, partno); | ||
282 | if (err) | ||
283 | return ERR_PTR(err); | ||
284 | ptbl = disk->part_tbl; | ||
285 | |||
286 | if (ptbl->part[partno]) | ||
287 | return ERR_PTR(-EBUSY); | ||
288 | |||
289 | p = kzalloc(sizeof(*p), GFP_KERNEL); | ||
290 | if (!p) | ||
291 | return ERR_PTR(-EBUSY); | ||
292 | |||
293 | if (!init_part_stats(p)) { | ||
294 | err = -ENOMEM; | ||
295 | goto out_free; | ||
296 | } | ||
297 | pdev = part_to_dev(p); | ||
298 | |||
299 | p->start_sect = start; | ||
300 | p->alignment_offset = | ||
301 | queue_limit_alignment_offset(&disk->queue->limits, start); | ||
302 | p->discard_alignment = | ||
303 | queue_limit_discard_alignment(&disk->queue->limits, start); | ||
304 | p->nr_sects = len; | ||
305 | p->partno = partno; | ||
306 | p->policy = get_disk_ro(disk); | ||
307 | |||
308 | if (info) { | ||
309 | struct partition_meta_info *pinfo = alloc_part_info(disk); | ||
310 | if (!pinfo) | ||
311 | goto out_free_stats; | ||
312 | memcpy(pinfo, info, sizeof(*info)); | ||
313 | p->info = pinfo; | ||
314 | } | ||
315 | |||
316 | dname = dev_name(ddev); | ||
317 | if (isdigit(dname[strlen(dname) - 1])) | ||
318 | dev_set_name(pdev, "%sp%d", dname, partno); | ||
319 | else | ||
320 | dev_set_name(pdev, "%s%d", dname, partno); | ||
321 | |||
322 | device_initialize(pdev); | ||
323 | pdev->class = &block_class; | ||
324 | pdev->type = &part_type; | ||
325 | pdev->parent = ddev; | ||
326 | |||
327 | err = blk_alloc_devt(p, &devt); | ||
328 | if (err) | ||
329 | goto out_free_info; | ||
330 | pdev->devt = devt; | ||
331 | |||
332 | /* delay uevent until 'holders' subdir is created */ | ||
333 | dev_set_uevent_suppress(pdev, 1); | ||
334 | err = device_add(pdev); | ||
335 | if (err) | ||
336 | goto out_put; | ||
337 | |||
338 | err = -ENOMEM; | ||
339 | p->holder_dir = kobject_create_and_add("holders", &pdev->kobj); | ||
340 | if (!p->holder_dir) | ||
341 | goto out_del; | ||
342 | |||
343 | dev_set_uevent_suppress(pdev, 0); | ||
344 | if (flags & ADDPART_FLAG_WHOLEDISK) { | ||
345 | err = device_create_file(pdev, &dev_attr_whole_disk); | ||
346 | if (err) | ||
347 | goto out_del; | ||
348 | } | ||
349 | |||
350 | /* everything is up and running, commence */ | ||
351 | rcu_assign_pointer(ptbl->part[partno], p); | ||
352 | |||
353 | /* suppress uevent if the disk suppresses it */ | ||
354 | if (!dev_get_uevent_suppress(ddev)) | ||
355 | kobject_uevent(&pdev->kobj, KOBJ_ADD); | ||
356 | |||
357 | hd_ref_init(p); | ||
358 | return p; | ||
359 | |||
360 | out_free_info: | ||
361 | free_part_info(p); | ||
362 | out_free_stats: | ||
363 | free_part_stats(p); | ||
364 | out_free: | ||
365 | kfree(p); | ||
366 | return ERR_PTR(err); | ||
367 | out_del: | ||
368 | kobject_put(p->holder_dir); | ||
369 | device_del(pdev); | ||
370 | out_put: | ||
371 | put_device(pdev); | ||
372 | blk_free_devt(devt); | ||
373 | return ERR_PTR(err); | ||
374 | } | ||
375 | |||
376 | static bool disk_unlock_native_capacity(struct gendisk *disk) | ||
377 | { | ||
378 | const struct block_device_operations *bdops = disk->fops; | ||
379 | |||
380 | if (bdops->unlock_native_capacity && | ||
381 | !(disk->flags & GENHD_FL_NATIVE_CAPACITY)) { | ||
382 | printk(KERN_CONT "enabling native capacity\n"); | ||
383 | bdops->unlock_native_capacity(disk); | ||
384 | disk->flags |= GENHD_FL_NATIVE_CAPACITY; | ||
385 | return true; | ||
386 | } else { | ||
387 | printk(KERN_CONT "truncated\n"); | ||
388 | return false; | ||
389 | } | ||
390 | } | ||
391 | |||
392 | int rescan_partitions(struct gendisk *disk, struct block_device *bdev) | ||
393 | { | ||
394 | struct parsed_partitions *state = NULL; | ||
395 | struct disk_part_iter piter; | ||
396 | struct hd_struct *part; | ||
397 | int p, highest, res; | ||
398 | rescan: | ||
399 | if (state && !IS_ERR(state)) { | ||
400 | kfree(state); | ||
401 | state = NULL; | ||
402 | } | ||
403 | |||
404 | if (bdev->bd_part_count) | ||
405 | return -EBUSY; | ||
406 | res = invalidate_partition(disk, 0); | ||
407 | if (res) | ||
408 | return res; | ||
409 | |||
410 | disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); | ||
411 | while ((part = disk_part_iter_next(&piter))) | ||
412 | delete_partition(disk, part->partno); | ||
413 | disk_part_iter_exit(&piter); | ||
414 | |||
415 | if (disk->fops->revalidate_disk) | ||
416 | disk->fops->revalidate_disk(disk); | ||
417 | check_disk_size_change(disk, bdev); | ||
418 | bdev->bd_invalidated = 0; | ||
419 | if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) | ||
420 | return 0; | ||
421 | if (IS_ERR(state)) { | ||
422 | /* | ||
423 | * I/O error reading the partition table. If any | ||
424 | * partition code tried to read beyond EOD, retry | ||
425 | * after unlocking native capacity. | ||
426 | */ | ||
427 | if (PTR_ERR(state) == -ENOSPC) { | ||
428 | printk(KERN_WARNING "%s: partition table beyond EOD, ", | ||
429 | disk->disk_name); | ||
430 | if (disk_unlock_native_capacity(disk)) | ||
431 | goto rescan; | ||
432 | } | ||
433 | return -EIO; | ||
434 | } | ||
435 | /* | ||
436 | * If any partition code tried to read beyond EOD, try | ||
437 | * unlocking native capacity even if partition table is | ||
438 | * successfully read as we could be missing some partitions. | ||
439 | */ | ||
440 | if (state->access_beyond_eod) { | ||
441 | printk(KERN_WARNING | ||
442 | "%s: partition table partially beyond EOD, ", | ||
443 | disk->disk_name); | ||
444 | if (disk_unlock_native_capacity(disk)) | ||
445 | goto rescan; | ||
446 | } | ||
447 | |||
448 | /* tell userspace that the media / partition table may have changed */ | ||
449 | kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE); | ||
450 | |||
451 | /* Detect the highest partition number and preallocate | ||
452 | * disk->part_tbl. This is an optimization and not strictly | ||
453 | * necessary. | ||
454 | */ | ||
455 | for (p = 1, highest = 0; p < state->limit; p++) | ||
456 | if (state->parts[p].size) | ||
457 | highest = p; | ||
458 | |||
459 | disk_expand_part_tbl(disk, highest); | ||
460 | |||
461 | /* add partitions */ | ||
462 | for (p = 1; p < state->limit; p++) { | ||
463 | sector_t size, from; | ||
464 | struct partition_meta_info *info = NULL; | ||
465 | |||
466 | size = state->parts[p].size; | ||
467 | if (!size) | ||
468 | continue; | ||
469 | |||
470 | from = state->parts[p].from; | ||
471 | if (from >= get_capacity(disk)) { | ||
472 | printk(KERN_WARNING | ||
473 | "%s: p%d start %llu is beyond EOD, ", | ||
474 | disk->disk_name, p, (unsigned long long) from); | ||
475 | if (disk_unlock_native_capacity(disk)) | ||
476 | goto rescan; | ||
477 | continue; | ||
478 | } | ||
479 | |||
480 | if (from + size > get_capacity(disk)) { | ||
481 | printk(KERN_WARNING | ||
482 | "%s: p%d size %llu extends beyond EOD, ", | ||
483 | disk->disk_name, p, (unsigned long long) size); | ||
484 | |||
485 | if (disk_unlock_native_capacity(disk)) { | ||
486 | /* free state and restart */ | ||
487 | goto rescan; | ||
488 | } else { | ||
489 | /* | ||
490 | * we can not ignore partitions of broken tables | ||
491 | * created by for example camera firmware, but | ||
492 | * we limit them to the end of the disk to avoid | ||
493 | * creating invalid block devices | ||
494 | */ | ||
495 | size = get_capacity(disk) - from; | ||
496 | } | ||
497 | } | ||
498 | |||
499 | if (state->parts[p].has_info) | ||
500 | info = &state->parts[p].info; | ||
501 | part = add_partition(disk, p, from, size, | ||
502 | state->parts[p].flags, | ||
503 | &state->parts[p].info); | ||
504 | if (IS_ERR(part)) { | ||
505 | printk(KERN_ERR " %s: p%d could not be added: %ld\n", | ||
506 | disk->disk_name, p, -PTR_ERR(part)); | ||
507 | continue; | ||
508 | } | ||
509 | #ifdef CONFIG_BLK_DEV_MD | ||
510 | if (state->parts[p].flags & ADDPART_FLAG_RAID) | ||
511 | md_autodetect_dev(part_to_dev(part)->devt); | ||
512 | #endif | ||
513 | } | ||
514 | kfree(state); | ||
515 | return 0; | ||
516 | } | ||
517 | |||
518 | unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) | ||
519 | { | ||
520 | struct address_space *mapping = bdev->bd_inode->i_mapping; | ||
521 | struct page *page; | ||
522 | |||
523 | page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), | ||
524 | NULL); | ||
525 | if (!IS_ERR(page)) { | ||
526 | if (PageError(page)) | ||
527 | goto fail; | ||
528 | p->v = page; | ||
529 | return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9); | ||
530 | fail: | ||
531 | page_cache_release(page); | ||
532 | } | ||
533 | p->v = NULL; | ||
534 | return NULL; | ||
535 | } | ||
536 | |||
537 | EXPORT_SYMBOL(read_dev_sector); | ||
diff --git a/block/partitions/check.c b/block/partitions/check.c index e3c63d1c5e13..bc908672c976 100644 --- a/block/partitions/check.c +++ b/block/partitions/check.c | |||
@@ -13,14 +13,9 @@ | |||
13 | * Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl} | 13 | * Added needed MAJORS for new pairs, {hdi,hdj}, {hdk,hdl} |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/module.h> | ||
18 | #include <linux/fs.h> | ||
19 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
20 | #include <linux/kmod.h> | ||
21 | #include <linux/ctype.h> | 17 | #include <linux/ctype.h> |
22 | #include <linux/genhd.h> | 18 | #include <linux/genhd.h> |
23 | #include <linux/blktrace_api.h> | ||
24 | 19 | ||
25 | #include "check.h" | 20 | #include "check.h" |
26 | 21 | ||
@@ -39,10 +34,6 @@ | |||
39 | #include "karma.h" | 34 | #include "karma.h" |
40 | #include "sysv68.h" | 35 | #include "sysv68.h" |
41 | 36 | ||
42 | #ifdef CONFIG_BLK_DEV_MD | ||
43 | extern void md_autodetect_dev(dev_t dev); | ||
44 | #endif | ||
45 | |||
46 | int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/ | 37 | int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/ |
47 | 38 | ||
48 | static int (*check_part[])(struct parsed_partitions *) = { | 39 | static int (*check_part[])(struct parsed_partitions *) = { |
@@ -114,48 +105,8 @@ static int (*check_part[])(struct parsed_partitions *) = { | |||
114 | #endif | 105 | #endif |
115 | NULL | 106 | NULL |
116 | }; | 107 | }; |
117 | |||
118 | /* | ||
119 | * disk_name() is used by partition check code and the genhd driver. | ||
120 | * It formats the devicename of the indicated disk into | ||
121 | * the supplied buffer (of size at least 32), and returns | ||
122 | * a pointer to that same buffer (for convenience). | ||
123 | */ | ||
124 | |||
125 | char *disk_name(struct gendisk *hd, int partno, char *buf) | ||
126 | { | ||
127 | if (!partno) | ||
128 | snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name); | ||
129 | else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) | ||
130 | snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, partno); | ||
131 | else | ||
132 | snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, partno); | ||
133 | |||
134 | return buf; | ||
135 | } | ||
136 | |||
137 | const char *bdevname(struct block_device *bdev, char *buf) | ||
138 | { | ||
139 | return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf); | ||
140 | } | ||
141 | |||
142 | EXPORT_SYMBOL(bdevname); | ||
143 | |||
144 | /* | ||
145 | * There's very little reason to use this, you should really | ||
146 | * have a struct block_device just about everywhere and use | ||
147 | * bdevname() instead. | ||
148 | */ | ||
149 | const char *__bdevname(dev_t dev, char *buffer) | ||
150 | { | ||
151 | scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)", | ||
152 | MAJOR(dev), MINOR(dev)); | ||
153 | return buffer; | ||
154 | } | ||
155 | |||
156 | EXPORT_SYMBOL(__bdevname); | ||
157 | 108 | ||
158 | static struct parsed_partitions * | 109 | struct parsed_partitions * |
159 | check_partition(struct gendisk *hd, struct block_device *bdev) | 110 | check_partition(struct gendisk *hd, struct block_device *bdev) |
160 | { | 111 | { |
161 | struct parsed_partitions *state; | 112 | struct parsed_partitions *state; |
@@ -213,475 +164,3 @@ check_partition(struct gendisk *hd, struct block_device *bdev) | |||
213 | kfree(state); | 164 | kfree(state); |
214 | return ERR_PTR(res); | 165 | return ERR_PTR(res); |
215 | } | 166 | } |
216 | |||
217 | static ssize_t part_partition_show(struct device *dev, | ||
218 | struct device_attribute *attr, char *buf) | ||
219 | { | ||
220 | struct hd_struct *p = dev_to_part(dev); | ||
221 | |||
222 | return sprintf(buf, "%d\n", p->partno); | ||
223 | } | ||
224 | |||
225 | static ssize_t part_start_show(struct device *dev, | ||
226 | struct device_attribute *attr, char *buf) | ||
227 | { | ||
228 | struct hd_struct *p = dev_to_part(dev); | ||
229 | |||
230 | return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect); | ||
231 | } | ||
232 | |||
233 | ssize_t part_size_show(struct device *dev, | ||
234 | struct device_attribute *attr, char *buf) | ||
235 | { | ||
236 | struct hd_struct *p = dev_to_part(dev); | ||
237 | return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects); | ||
238 | } | ||
239 | |||
240 | static ssize_t part_ro_show(struct device *dev, | ||
241 | struct device_attribute *attr, char *buf) | ||
242 | { | ||
243 | struct hd_struct *p = dev_to_part(dev); | ||
244 | return sprintf(buf, "%d\n", p->policy ? 1 : 0); | ||
245 | } | ||
246 | |||
247 | static ssize_t part_alignment_offset_show(struct device *dev, | ||
248 | struct device_attribute *attr, char *buf) | ||
249 | { | ||
250 | struct hd_struct *p = dev_to_part(dev); | ||
251 | return sprintf(buf, "%llu\n", (unsigned long long)p->alignment_offset); | ||
252 | } | ||
253 | |||
254 | static ssize_t part_discard_alignment_show(struct device *dev, | ||
255 | struct device_attribute *attr, char *buf) | ||
256 | { | ||
257 | struct hd_struct *p = dev_to_part(dev); | ||
258 | return sprintf(buf, "%u\n", p->discard_alignment); | ||
259 | } | ||
260 | |||
261 | ssize_t part_stat_show(struct device *dev, | ||
262 | struct device_attribute *attr, char *buf) | ||
263 | { | ||
264 | struct hd_struct *p = dev_to_part(dev); | ||
265 | int cpu; | ||
266 | |||
267 | cpu = part_stat_lock(); | ||
268 | part_round_stats(cpu, p); | ||
269 | part_stat_unlock(); | ||
270 | return sprintf(buf, | ||
271 | "%8lu %8lu %8llu %8u " | ||
272 | "%8lu %8lu %8llu %8u " | ||
273 | "%8u %8u %8u" | ||
274 | "\n", | ||
275 | part_stat_read(p, ios[READ]), | ||
276 | part_stat_read(p, merges[READ]), | ||
277 | (unsigned long long)part_stat_read(p, sectors[READ]), | ||
278 | jiffies_to_msecs(part_stat_read(p, ticks[READ])), | ||
279 | part_stat_read(p, ios[WRITE]), | ||
280 | part_stat_read(p, merges[WRITE]), | ||
281 | (unsigned long long)part_stat_read(p, sectors[WRITE]), | ||
282 | jiffies_to_msecs(part_stat_read(p, ticks[WRITE])), | ||
283 | part_in_flight(p), | ||
284 | jiffies_to_msecs(part_stat_read(p, io_ticks)), | ||
285 | jiffies_to_msecs(part_stat_read(p, time_in_queue))); | ||
286 | } | ||
287 | |||
288 | ssize_t part_inflight_show(struct device *dev, | ||
289 | struct device_attribute *attr, char *buf) | ||
290 | { | ||
291 | struct hd_struct *p = dev_to_part(dev); | ||
292 | |||
293 | return sprintf(buf, "%8u %8u\n", atomic_read(&p->in_flight[0]), | ||
294 | atomic_read(&p->in_flight[1])); | ||
295 | } | ||
296 | |||
297 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
298 | ssize_t part_fail_show(struct device *dev, | ||
299 | struct device_attribute *attr, char *buf) | ||
300 | { | ||
301 | struct hd_struct *p = dev_to_part(dev); | ||
302 | |||
303 | return sprintf(buf, "%d\n", p->make_it_fail); | ||
304 | } | ||
305 | |||
306 | ssize_t part_fail_store(struct device *dev, | ||
307 | struct device_attribute *attr, | ||
308 | const char *buf, size_t count) | ||
309 | { | ||
310 | struct hd_struct *p = dev_to_part(dev); | ||
311 | int i; | ||
312 | |||
313 | if (count > 0 && sscanf(buf, "%d", &i) > 0) | ||
314 | p->make_it_fail = (i == 0) ? 0 : 1; | ||
315 | |||
316 | return count; | ||
317 | } | ||
318 | #endif | ||
319 | |||
320 | static DEVICE_ATTR(partition, S_IRUGO, part_partition_show, NULL); | ||
321 | static DEVICE_ATTR(start, S_IRUGO, part_start_show, NULL); | ||
322 | static DEVICE_ATTR(size, S_IRUGO, part_size_show, NULL); | ||
323 | static DEVICE_ATTR(ro, S_IRUGO, part_ro_show, NULL); | ||
324 | static DEVICE_ATTR(alignment_offset, S_IRUGO, part_alignment_offset_show, NULL); | ||
325 | static DEVICE_ATTR(discard_alignment, S_IRUGO, part_discard_alignment_show, | ||
326 | NULL); | ||
327 | static DEVICE_ATTR(stat, S_IRUGO, part_stat_show, NULL); | ||
328 | static DEVICE_ATTR(inflight, S_IRUGO, part_inflight_show, NULL); | ||
329 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
330 | static struct device_attribute dev_attr_fail = | ||
331 | __ATTR(make-it-fail, S_IRUGO|S_IWUSR, part_fail_show, part_fail_store); | ||
332 | #endif | ||
333 | |||
334 | static struct attribute *part_attrs[] = { | ||
335 | &dev_attr_partition.attr, | ||
336 | &dev_attr_start.attr, | ||
337 | &dev_attr_size.attr, | ||
338 | &dev_attr_ro.attr, | ||
339 | &dev_attr_alignment_offset.attr, | ||
340 | &dev_attr_discard_alignment.attr, | ||
341 | &dev_attr_stat.attr, | ||
342 | &dev_attr_inflight.attr, | ||
343 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
344 | &dev_attr_fail.attr, | ||
345 | #endif | ||
346 | NULL | ||
347 | }; | ||
348 | |||
349 | static struct attribute_group part_attr_group = { | ||
350 | .attrs = part_attrs, | ||
351 | }; | ||
352 | |||
353 | static const struct attribute_group *part_attr_groups[] = { | ||
354 | &part_attr_group, | ||
355 | #ifdef CONFIG_BLK_DEV_IO_TRACE | ||
356 | &blk_trace_attr_group, | ||
357 | #endif | ||
358 | NULL | ||
359 | }; | ||
360 | |||
361 | static void part_release(struct device *dev) | ||
362 | { | ||
363 | struct hd_struct *p = dev_to_part(dev); | ||
364 | free_part_stats(p); | ||
365 | free_part_info(p); | ||
366 | kfree(p); | ||
367 | } | ||
368 | |||
369 | struct device_type part_type = { | ||
370 | .name = "partition", | ||
371 | .groups = part_attr_groups, | ||
372 | .release = part_release, | ||
373 | }; | ||
374 | |||
375 | static void delete_partition_rcu_cb(struct rcu_head *head) | ||
376 | { | ||
377 | struct hd_struct *part = container_of(head, struct hd_struct, rcu_head); | ||
378 | |||
379 | part->start_sect = 0; | ||
380 | part->nr_sects = 0; | ||
381 | part_stat_set_all(part, 0); | ||
382 | put_device(part_to_dev(part)); | ||
383 | } | ||
384 | |||
385 | void __delete_partition(struct hd_struct *part) | ||
386 | { | ||
387 | call_rcu(&part->rcu_head, delete_partition_rcu_cb); | ||
388 | } | ||
389 | |||
390 | void delete_partition(struct gendisk *disk, int partno) | ||
391 | { | ||
392 | struct disk_part_tbl *ptbl = disk->part_tbl; | ||
393 | struct hd_struct *part; | ||
394 | |||
395 | if (partno >= ptbl->len) | ||
396 | return; | ||
397 | |||
398 | part = ptbl->part[partno]; | ||
399 | if (!part) | ||
400 | return; | ||
401 | |||
402 | blk_free_devt(part_devt(part)); | ||
403 | rcu_assign_pointer(ptbl->part[partno], NULL); | ||
404 | rcu_assign_pointer(ptbl->last_lookup, NULL); | ||
405 | kobject_put(part->holder_dir); | ||
406 | device_del(part_to_dev(part)); | ||
407 | |||
408 | hd_struct_put(part); | ||
409 | } | ||
410 | |||
411 | static ssize_t whole_disk_show(struct device *dev, | ||
412 | struct device_attribute *attr, char *buf) | ||
413 | { | ||
414 | return 0; | ||
415 | } | ||
416 | static DEVICE_ATTR(whole_disk, S_IRUSR | S_IRGRP | S_IROTH, | ||
417 | whole_disk_show, NULL); | ||
418 | |||
419 | struct hd_struct *add_partition(struct gendisk *disk, int partno, | ||
420 | sector_t start, sector_t len, int flags, | ||
421 | struct partition_meta_info *info) | ||
422 | { | ||
423 | struct hd_struct *p; | ||
424 | dev_t devt = MKDEV(0, 0); | ||
425 | struct device *ddev = disk_to_dev(disk); | ||
426 | struct device *pdev; | ||
427 | struct disk_part_tbl *ptbl; | ||
428 | const char *dname; | ||
429 | int err; | ||
430 | |||
431 | err = disk_expand_part_tbl(disk, partno); | ||
432 | if (err) | ||
433 | return ERR_PTR(err); | ||
434 | ptbl = disk->part_tbl; | ||
435 | |||
436 | if (ptbl->part[partno]) | ||
437 | return ERR_PTR(-EBUSY); | ||
438 | |||
439 | p = kzalloc(sizeof(*p), GFP_KERNEL); | ||
440 | if (!p) | ||
441 | return ERR_PTR(-EBUSY); | ||
442 | |||
443 | if (!init_part_stats(p)) { | ||
444 | err = -ENOMEM; | ||
445 | goto out_free; | ||
446 | } | ||
447 | pdev = part_to_dev(p); | ||
448 | |||
449 | p->start_sect = start; | ||
450 | p->alignment_offset = | ||
451 | queue_limit_alignment_offset(&disk->queue->limits, start); | ||
452 | p->discard_alignment = | ||
453 | queue_limit_discard_alignment(&disk->queue->limits, start); | ||
454 | p->nr_sects = len; | ||
455 | p->partno = partno; | ||
456 | p->policy = get_disk_ro(disk); | ||
457 | |||
458 | if (info) { | ||
459 | struct partition_meta_info *pinfo = alloc_part_info(disk); | ||
460 | if (!pinfo) | ||
461 | goto out_free_stats; | ||
462 | memcpy(pinfo, info, sizeof(*info)); | ||
463 | p->info = pinfo; | ||
464 | } | ||
465 | |||
466 | dname = dev_name(ddev); | ||
467 | if (isdigit(dname[strlen(dname) - 1])) | ||
468 | dev_set_name(pdev, "%sp%d", dname, partno); | ||
469 | else | ||
470 | dev_set_name(pdev, "%s%d", dname, partno); | ||
471 | |||
472 | device_initialize(pdev); | ||
473 | pdev->class = &block_class; | ||
474 | pdev->type = &part_type; | ||
475 | pdev->parent = ddev; | ||
476 | |||
477 | err = blk_alloc_devt(p, &devt); | ||
478 | if (err) | ||
479 | goto out_free_info; | ||
480 | pdev->devt = devt; | ||
481 | |||
482 | /* delay uevent until 'holders' subdir is created */ | ||
483 | dev_set_uevent_suppress(pdev, 1); | ||
484 | err = device_add(pdev); | ||
485 | if (err) | ||
486 | goto out_put; | ||
487 | |||
488 | err = -ENOMEM; | ||
489 | p->holder_dir = kobject_create_and_add("holders", &pdev->kobj); | ||
490 | if (!p->holder_dir) | ||
491 | goto out_del; | ||
492 | |||
493 | dev_set_uevent_suppress(pdev, 0); | ||
494 | if (flags & ADDPART_FLAG_WHOLEDISK) { | ||
495 | err = device_create_file(pdev, &dev_attr_whole_disk); | ||
496 | if (err) | ||
497 | goto out_del; | ||
498 | } | ||
499 | |||
500 | /* everything is up and running, commence */ | ||
501 | rcu_assign_pointer(ptbl->part[partno], p); | ||
502 | |||
503 | /* suppress uevent if the disk suppresses it */ | ||
504 | if (!dev_get_uevent_suppress(ddev)) | ||
505 | kobject_uevent(&pdev->kobj, KOBJ_ADD); | ||
506 | |||
507 | hd_ref_init(p); | ||
508 | return p; | ||
509 | |||
510 | out_free_info: | ||
511 | free_part_info(p); | ||
512 | out_free_stats: | ||
513 | free_part_stats(p); | ||
514 | out_free: | ||
515 | kfree(p); | ||
516 | return ERR_PTR(err); | ||
517 | out_del: | ||
518 | kobject_put(p->holder_dir); | ||
519 | device_del(pdev); | ||
520 | out_put: | ||
521 | put_device(pdev); | ||
522 | blk_free_devt(devt); | ||
523 | return ERR_PTR(err); | ||
524 | } | ||
525 | |||
526 | static bool disk_unlock_native_capacity(struct gendisk *disk) | ||
527 | { | ||
528 | const struct block_device_operations *bdops = disk->fops; | ||
529 | |||
530 | if (bdops->unlock_native_capacity && | ||
531 | !(disk->flags & GENHD_FL_NATIVE_CAPACITY)) { | ||
532 | printk(KERN_CONT "enabling native capacity\n"); | ||
533 | bdops->unlock_native_capacity(disk); | ||
534 | disk->flags |= GENHD_FL_NATIVE_CAPACITY; | ||
535 | return true; | ||
536 | } else { | ||
537 | printk(KERN_CONT "truncated\n"); | ||
538 | return false; | ||
539 | } | ||
540 | } | ||
541 | |||
542 | int rescan_partitions(struct gendisk *disk, struct block_device *bdev) | ||
543 | { | ||
544 | struct parsed_partitions *state = NULL; | ||
545 | struct disk_part_iter piter; | ||
546 | struct hd_struct *part; | ||
547 | int p, highest, res; | ||
548 | rescan: | ||
549 | if (state && !IS_ERR(state)) { | ||
550 | kfree(state); | ||
551 | state = NULL; | ||
552 | } | ||
553 | |||
554 | if (bdev->bd_part_count) | ||
555 | return -EBUSY; | ||
556 | res = invalidate_partition(disk, 0); | ||
557 | if (res) | ||
558 | return res; | ||
559 | |||
560 | disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); | ||
561 | while ((part = disk_part_iter_next(&piter))) | ||
562 | delete_partition(disk, part->partno); | ||
563 | disk_part_iter_exit(&piter); | ||
564 | |||
565 | if (disk->fops->revalidate_disk) | ||
566 | disk->fops->revalidate_disk(disk); | ||
567 | check_disk_size_change(disk, bdev); | ||
568 | bdev->bd_invalidated = 0; | ||
569 | if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) | ||
570 | return 0; | ||
571 | if (IS_ERR(state)) { | ||
572 | /* | ||
573 | * I/O error reading the partition table. If any | ||
574 | * partition code tried to read beyond EOD, retry | ||
575 | * after unlocking native capacity. | ||
576 | */ | ||
577 | if (PTR_ERR(state) == -ENOSPC) { | ||
578 | printk(KERN_WARNING "%s: partition table beyond EOD, ", | ||
579 | disk->disk_name); | ||
580 | if (disk_unlock_native_capacity(disk)) | ||
581 | goto rescan; | ||
582 | } | ||
583 | return -EIO; | ||
584 | } | ||
585 | /* | ||
586 | * If any partition code tried to read beyond EOD, try | ||
587 | * unlocking native capacity even if partition table is | ||
588 | * successfully read as we could be missing some partitions. | ||
589 | */ | ||
590 | if (state->access_beyond_eod) { | ||
591 | printk(KERN_WARNING | ||
592 | "%s: partition table partially beyond EOD, ", | ||
593 | disk->disk_name); | ||
594 | if (disk_unlock_native_capacity(disk)) | ||
595 | goto rescan; | ||
596 | } | ||
597 | |||
598 | /* tell userspace that the media / partition table may have changed */ | ||
599 | kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE); | ||
600 | |||
601 | /* Detect the highest partition number and preallocate | ||
602 | * disk->part_tbl. This is an optimization and not strictly | ||
603 | * necessary. | ||
604 | */ | ||
605 | for (p = 1, highest = 0; p < state->limit; p++) | ||
606 | if (state->parts[p].size) | ||
607 | highest = p; | ||
608 | |||
609 | disk_expand_part_tbl(disk, highest); | ||
610 | |||
611 | /* add partitions */ | ||
612 | for (p = 1; p < state->limit; p++) { | ||
613 | sector_t size, from; | ||
614 | struct partition_meta_info *info = NULL; | ||
615 | |||
616 | size = state->parts[p].size; | ||
617 | if (!size) | ||
618 | continue; | ||
619 | |||
620 | from = state->parts[p].from; | ||
621 | if (from >= get_capacity(disk)) { | ||
622 | printk(KERN_WARNING | ||
623 | "%s: p%d start %llu is beyond EOD, ", | ||
624 | disk->disk_name, p, (unsigned long long) from); | ||
625 | if (disk_unlock_native_capacity(disk)) | ||
626 | goto rescan; | ||
627 | continue; | ||
628 | } | ||
629 | |||
630 | if (from + size > get_capacity(disk)) { | ||
631 | printk(KERN_WARNING | ||
632 | "%s: p%d size %llu extends beyond EOD, ", | ||
633 | disk->disk_name, p, (unsigned long long) size); | ||
634 | |||
635 | if (disk_unlock_native_capacity(disk)) { | ||
636 | /* free state and restart */ | ||
637 | goto rescan; | ||
638 | } else { | ||
639 | /* | ||
640 | * we can not ignore partitions of broken tables | ||
641 | * created by for example camera firmware, but | ||
642 | * we limit them to the end of the disk to avoid | ||
643 | * creating invalid block devices | ||
644 | */ | ||
645 | size = get_capacity(disk) - from; | ||
646 | } | ||
647 | } | ||
648 | |||
649 | if (state->parts[p].has_info) | ||
650 | info = &state->parts[p].info; | ||
651 | part = add_partition(disk, p, from, size, | ||
652 | state->parts[p].flags, | ||
653 | &state->parts[p].info); | ||
654 | if (IS_ERR(part)) { | ||
655 | printk(KERN_ERR " %s: p%d could not be added: %ld\n", | ||
656 | disk->disk_name, p, -PTR_ERR(part)); | ||
657 | continue; | ||
658 | } | ||
659 | #ifdef CONFIG_BLK_DEV_MD | ||
660 | if (state->parts[p].flags & ADDPART_FLAG_RAID) | ||
661 | md_autodetect_dev(part_to_dev(part)->devt); | ||
662 | #endif | ||
663 | } | ||
664 | kfree(state); | ||
665 | return 0; | ||
666 | } | ||
667 | |||
668 | unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) | ||
669 | { | ||
670 | struct address_space *mapping = bdev->bd_inode->i_mapping; | ||
671 | struct page *page; | ||
672 | |||
673 | page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)), | ||
674 | NULL); | ||
675 | if (!IS_ERR(page)) { | ||
676 | if (PageError(page)) | ||
677 | goto fail; | ||
678 | p->v = page; | ||
679 | return (unsigned char *)page_address(page) + ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9); | ||
680 | fail: | ||
681 | page_cache_release(page); | ||
682 | } | ||
683 | p->v = NULL; | ||
684 | return NULL; | ||
685 | } | ||
686 | |||
687 | EXPORT_SYMBOL(read_dev_sector); | ||
diff --git a/block/partitions/check.h b/block/partitions/check.h index d68bf4dc3bc2..52b100311ec3 100644 --- a/block/partitions/check.h +++ b/block/partitions/check.h | |||
@@ -22,6 +22,9 @@ struct parsed_partitions { | |||
22 | char *pp_buf; | 22 | char *pp_buf; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | struct parsed_partitions * | ||
26 | check_partition(struct gendisk *, struct block_device *); | ||
27 | |||
25 | static inline void *read_part_sector(struct parsed_partitions *state, | 28 | static inline void *read_part_sector(struct parsed_partitions *state, |
26 | sector_t n, Sector *p) | 29 | sector_t n, Sector *p) |
27 | { | 30 | { |