aboutsummaryrefslogtreecommitdiffstats
path: root/fs/partitions/check.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
committerJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /fs/partitions/check.c
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/partitions/check.c')
-rw-r--r--fs/partitions/check.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ac546975031f..d545e97d99c3 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -500,7 +500,7 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
500 /* everything is up and running, commence */ 500 /* everything is up and running, commence */
501 rcu_assign_pointer(ptbl->part[partno], p); 501 rcu_assign_pointer(ptbl->part[partno], p);
502 502
503 /* suppress uevent if the disk supresses it */ 503 /* suppress uevent if the disk suppresses it */
504 if (!dev_get_uevent_suppress(ddev)) 504 if (!dev_get_uevent_suppress(ddev))
505 kobject_uevent(&pdev->kobj, KOBJ_ADD); 505 kobject_uevent(&pdev->kobj, KOBJ_ADD);
506 506
@@ -585,7 +585,7 @@ rescan:
585 /* 585 /*
586 * If any partition code tried to read beyond EOD, try 586 * If any partition code tried to read beyond EOD, try
587 * unlocking native capacity even if partition table is 587 * unlocking native capacity even if partition table is
588 * sucessfully read as we could be missing some partitions. 588 * successfully read as we could be missing some partitions.
589 */ 589 */
590 if (state->access_beyond_eod) { 590 if (state->access_beyond_eod) {
591 printk(KERN_WARNING 591 printk(KERN_WARNING