[Linux-NTFS-cvs] CVS: dynamic-disk/test compat.c,1.14,1.15 dump.c,1.12,1.13 extra.h,1.3,1.4 ldminfo.c,1.27,1.28 ldminfo.h,1.14,1.15

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv1138/test

Modified Files:
	compat.c dump.c extra.h ldminfo.c ldminfo.h 
Log Message:
reverted list_t following lkml thread


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- compat.c	18 Apr 2002 23:23:19 -0000	1.14
+++ compat.c	17 Jun 2002 00:15:13 -0000	1.15
@@ -66,4 +66,7 @@
 	va_end (args);
 
+	if ((!debug) && (!strcmp (buf, " [LDM]")))
+		return 0;
+
 	if (ignore) {
 		ignore = (strchr (buf, '\n') == NULL);

Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- dump.c	10 Apr 2002 15:42:00 -0000	1.12
+++ dump.c	17 Jun 2002 00:15:13 -0000	1.13
@@ -139,5 +139,5 @@
 static int dump_vmdb (struct ldmdb *ldb)
 {
-	list_t *item;
+	struct list *item;
 	struct vmdb *vm = &ldb->vm;
 
@@ -214,5 +214,5 @@
 static int dump_disks (struct ldmdb *ldb)
 {
-	list_t *disk_item, *part_item;
+	struct list *disk_item, *part_item;
 	struct vblk      *disk_vb,   *part_vb;
 
@@ -249,5 +249,5 @@
 static int dump_volumes (struct ldmdb *ldb)
 {
-	list_t *volu_item, *comp_item, *part_item;
+	struct list *volu_item, *comp_item, *part_item;
 	struct vblk      *volu_vb,   *comp_vb,   *part_vb;
 

Index: extra.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/extra.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- extra.h	17 Feb 2002 22:13:34 -0000	1.3
+++ extra.h	17 Jun 2002 00:15:13 -0000	1.4
@@ -20,10 +20,10 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
-typedef struct list_head list_t;
-#endif
-
 #include <linux/slab.h>
 #include <linux/pagemap.h>
+
+#define KDEV_MINOR_BITS		8
+#define __mkdev(major,minor)	(((major) << KDEV_MINOR_BITS) + (minor))
+#define mk_kdev(major, minor)	((kdev_t) { __mkdev(major,minor) } )
 
 void * __kmalloc (size_t size, int flags, char *fn);

Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- ldminfo.c	25 Apr 2002 12:01:52 -0000	1.27
+++ ldminfo.c	17 Jun 2002 00:15:13 -0000	1.28
@@ -103,7 +103,4 @@
 	    	return -1;
 
-	if (!ldm_create_partition (hd, first_minor++, base, ldb->ph.config_size))
-		goto free_buffers;
-
 	if (!ldm_get_vblks (bdev, base, ldb)) {
 		printk (LDM_CRIT "get vblks failed\n");

Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ldminfo.h	10 Apr 2002 15:42:01 -0000	1.14
+++ ldminfo.h	17 Jun 2002 00:15:13 -0000	1.15
@@ -84,8 +84,8 @@
 int ldm_validate_tocblocks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
 int ldm_validate_vmdb (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
-int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, list_t *lh_bh, list_t *lh_vl);
+int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, struct list *lh_bh, struct list *lh_vl);
 struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb);
-void ldm_free_buffers (list_t *bh);
-void ldm_free_vblks (list_t *vb);
+void ldm_free_buffers (struct list *bh);
+void ldm_free_vblks (struct list *vb);
 int ldm_get_vblks(struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
 int ldm_combine_vblks (struct ldmdb *ldb);