|
From: Richard R. <fl...@us...> - 2002-08-09 10:27:49
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/patch
In directory usw-pr-cvs1:/tmp/cvs-serv20489/patch
Modified Files:
readme remove-non-kernel
Removed Files:
linux-2.4.18-ldm linux-2.4.19-pre10-ldm linux-2.5.23-ldm
linux-2.5.24-ldm
Log Message:
patches updated
Index: readme
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/patch/readme,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- readme 23 Jun 2002 16:38:25 -0000 1.1
+++ readme 9 Aug 2002 10:27:40 -0000 1.2
@@ -1,10 +1,9 @@
-If you want to add the latest LDM driver to the kernel you can use the patches
-in this directory.
+The new driver has now been accepted into the 2.5 Linux kernel (2.5.29).
-Patch For Kernel
+If you want to add the latest LDM driver to a 2.4 kernel you can use
+one of these patches:
+
+Marcelo patch-2.4.19-ldm
+Alan patch-2.4.20-pre1-ac1-ldm
-linux-2.4.18-ldm 2.4.17 or 2.4.18
-linux-2.4.19-pre10-ldm 2.4.19-pre10 or later
-linux-2.5.23-ldm 2.5.23 or earlier
-linux-2.5.24-ldm 2.5.24 or later
Index: remove-non-kernel
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/patch/remove-non-kernel,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- remove-non-kernel 23 Jun 2002 16:38:25 -0000 1.1
+++ remove-non-kernel 9 Aug 2002 10:27:40 -0000 1.2
@@ -1,5 +1,5 @@
---- src/ldm.c Fri Jun 21 15:37:16 2002
-+++ kernel/ldm.c Sun Jun 23 17:12:45 2002
-@@ -32,19 +32,6 @@
+--- src/ldm.c Mon Aug 5 15:34:38 2002
++++ kernel/ldm.c Mon Aug 5 16:50:20 2002
+@@ -29,19 +29,6 @@
#include "check.h"
#include "msdos.h"
@@ -14,6 +14,6 @@
-
-#ifdef CONFIG_LDM_MD
--extern void ldm_md_addpart (const u8 *dg_guid, u32 objid, u8 comptype,
-- u8 n, u8 parts, u8 chunk_s, kdev_t dev);
+-void ldm_md_addpart(const u8 *dg_guid, u32 objid, u8 comptype,
+- u8 n, u8 parts, u8 chunk_s, kdev_t dev);
-#endif
-
@@ -21,5 +21,5 @@
FALSE = 0,
TRUE = 1
-@@ -603,32 +590,6 @@
+@@ -594,32 +581,6 @@
}
@@ -52,21 +52,36 @@
-/**
* ldm_get_disk_objid - Search a linked list of vblk's for a given Disk Id
- * @ldb: ldmdb struct
+ * @ldb: Cache of the database structures
*
-@@ -732,10 +693,6 @@
+@@ -662,14 +623,8 @@
+ * Return: TRUE Partition created
+ * FALSE Error, probably a range checking problem
+ */
+-#ifdef CONFIG_BLK_DEV_MD
+-static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+- const struct ldmdb *ldb,
+- struct block_device *bdev)
+-#else
+ static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+ const struct ldmdb *ldb)
+-#endif
+ {
+ struct list_head *item;
+ struct vblk *vb;
+@@ -689,10 +644,6 @@
+
/* Create the data partitions */
list_for_each (item, &ldb->v_part) {
- struct vblk *vb;
-#ifdef CONFIG_BLK_DEV_MD /* CONFIG_LDM_MD implies CONFIG_BLK_DEV_MD */
- struct vblk *v, *c;
-- const kdev_t dev = mk_kdev (hd->major, minor);
+- const kdev_t dev = bdev->bd_inode->i_dev;
-#endif
vb = list_entry (item, struct vblk, list);
part = &vb->vblk.part;
-@@ -746,33 +703,6 @@
- part->start + ldb->ph.logical_disk_start, part->size))
- continue; /* Already logged */
- minor++;
+@@ -701,33 +652,6 @@
+
+ put_partition (pp, part_num, ldb->ph.logical_disk_start +
+ part->start, part->size);
-#ifdef CONFIG_BLK_DEV_MD
- /* Try to get parent component */
@@ -89,6 +104,6 @@
- continue;
- }
-- /* Register to LDM_MD */
-#ifdef CONFIG_LDM_MD
+- /* Register to LDM_MD */
- ldm_md_addpart (v->vblk.volu.guid, c->obj_id,
- c->vblk.comp.type, part->partnum, c->vblk.comp.children,
@@ -96,5 +111,78 @@
-#endif
-#endif
+ part_num++;
+ }
+
+@@ -1490,15 +1414,9 @@
+ * -1 An error occurred before enough information had been read
+ * Or @bdev is a dynamic disk, but it may be corrupted
+ */
+-#ifdef CONFIG_LDM_EXPORT_SYMBOLS
+-int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev, struct ldmdb *ldb)
+-#else
+ int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev)
+-#endif
+ {
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ struct ldmdb *ldb;
+-#endif
+ unsigned long base;
+ int result = -1;
+
+@@ -1508,13 +1426,11 @@
+ if (!ldm_validate_partition_table (bdev))
+ return 0;
+
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
+ if (!ldb) {
+ ldm_crit ("Out of memory.");
+ goto out;
+ }
+-#endif
+
+ /* Parse and check privheads. */
+ if (!ldm_validate_privheads (bdev, &ldb->ph))
+@@ -1529,13 +1445,11 @@
+ goto out; /* Already logged */
+
+ /* Initialize vblk lists in ldmdb struct */
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ INIT_LIST_HEAD (&ldb->v_dgrp);
+ INIT_LIST_HEAD (&ldb->v_disk);
+ INIT_LIST_HEAD (&ldb->v_volu);
+ INIT_LIST_HEAD (&ldb->v_comp);
+ INIT_LIST_HEAD (&ldb->v_part);
+-#endif
+
+ if (!ldm_get_vblks (bdev, base, ldb)) {
+ ldm_crit ("Failed to read the VBLKs from the database.");
+@@ -1543,28 +1457,20 @@
+ }
+
+ /* Finally, create the data partition devices. */
+-#ifdef CONFIG_BLK_DEV_MD
+- if (ldm_create_data_partitions (pp, ldb, bdev)) {
+-#else
+ if (ldm_create_data_partitions (pp, ldb)) {
+-#endif
+ ldm_debug ("Parsed LDM database successfully.");
+ result = 1;
}
+ /* else Already logged */
+
+ cleanup:
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ ldm_free_vblks (&ldb->v_dgrp);
+ ldm_free_vblks (&ldb->v_disk);
+ ldm_free_vblks (&ldb->v_volu);
+ ldm_free_vblks (&ldb->v_comp);
+ ldm_free_vblks (&ldb->v_part);
+-#endif
+ out:
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ kfree (ldb);
+-#endif
+ return result;
+ }
- printk ("\n");
--- linux-2.4.18-ldm DELETED ---
--- linux-2.4.19-pre10-ldm DELETED ---
--- linux-2.5.23-ldm DELETED ---
--- linux-2.5.24-ldm DELETED ---
|
