[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ntfs-cvs
Subject:    [Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.25.2.7,1.25.2.8
From:       Anton Altaparmakov <antona () users ! sourceforge ! net>
Date:       2001-10-28 20:46:34
[Download RAW message or body]


Changes by: antona

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv969/linux/fs/partitions

Modified Files:
      Tag: kernel-latest
	ldm.c 
Log Message:
Fix the missing partitions in the sort. (I hope.) Also updated to 2.4.13-ac4 (no difference to ac3).


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.25.2.7
retrieving revision 1.25.2.8
diff -U2 -r1.25.2.7 -r1.25.2.8
--- ldm.c	2001/10/28 17:55:04	1.25.2.7
+++ ldm.c	2001/10/28 20:46:32	1.25.2.8
@@ -1,9 +1,7 @@
 /*
- * $Id$
- *
  * ldm - Part of the Linux-NTFS project.
  *
  * Copyright (C) 2001 Richard Russon <ntfs@flatcap.org>
- * Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net>
+ * Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net> (AIA)
  *
  * Documentation is available at http://linux-ntfs.sf.net/ldm
@@ -23,4 +21,6 @@
  * in the file COPYING); if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * 28/10/2001 - Added sorting of ldm partitions. (AIA)
  */
 #include <linux/types.h>
@@ -197,18 +197,15 @@
 	lp->start = start;
 	lp->size = size;
-	if (list_empty(pl))
-		list_add(&lp->part_list, pl);
-	else list_for_each(tmp, pl) {
+	list_for_each(tmp, pl) {
 		lptmp = list_entry(tmp, struct ldm_part, part_list);
 		if (start > lptmp->start)
 			continue;
-		if (start < lptmp->start) {
-			list_add_tail(&lp->part_list, tmp);
+		if (start < lptmp->start)
 			break;
-		}
 		printk(LDM_CRIT "Duplicate LDM partition entry! Skipping.\n");
 		kfree(lp);
 		return -1;
 	}
+	list_add_tail(&lp->part_list, tmp);
 	ldm_debug("Added LDM partition successfully.\n");
 	return 1;
@@ -299,8 +296,10 @@
 					ph->logical_disk_start,
 					vb->num_sectors) < -1)
-				break;
+				goto brelse_out;
 		}
 		put_dev_sector(sect);
 	}
+	err = 1;
+out:
 	/* Finally create the nicely sorted data partitions. */
 	printk(" <");
@@ -310,6 +309,4 @@
 	}
 	printk(" >\n");
-	err = 1;
-out:
 	if (!list_empty(&pl)) {
 		struct list_head *tmp2;


_______________________________________________
Linux-NTFS-cvs mailing list
Linux-NTFS-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-ntfs-cvs

[prev in list] [next in list] [prev in thread] [next in thread]