X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Fpartitions%2Fcheck.c;h=9a3a058f355365405911c3f1173209cfac30150d;hb=df6d3916f3b7b7e2067567a256dd4f0c1ea854a2;hp=f01572fca02f61f9de57e9912e078b882c320fd0;hpb=a3d52136ee8f7399859f9a0824470fd49b1d1a00;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index f01572fca02f..9a3a058f3553 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -34,6 +34,7 @@
 #include "ultrix.h"
 #include "efi.h"
 #include "karma.h"
+#include "sysv68.h"
 
 #ifdef CONFIG_BLK_DEV_MD
 extern void md_autodetect_dev(dev_t dev);
@@ -104,6 +105,9 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
 #endif
 #ifdef CONFIG_KARMA_PARTITION
 	karma_partition,
+#endif
+#ifdef CONFIG_SYSV68_PARTITION
+	sysv68_partition,
 #endif
 	NULL
 };
@@ -569,9 +573,6 @@ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
 	page = read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),
 				 NULL);
 	if (!IS_ERR(page)) {
-		wait_on_page_locked(page);
-		if (!PageUptodate(page))
-			goto fail;
 		if (PageError(page))
 			goto fail;
 		p->v = page;