r1092 - in trunk: . util-linux

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sat Sep 3 09:05:23 PDT 2005


Author: jim
Date: 2005-09-03 10:05:22 -0600 (Sat, 03 Sep 2005)
New Revision: 1092

Added:
   trunk/util-linux/util-linux-2.12q-reiser_crash-1.patch
Modified:
   trunk/
Log:
 r1206 at server:  jim | 2005-09-03 09:05:02 -0700
 Added: util-linux-2.12q-reiser_crash-1.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1202
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1206

Added: trunk/util-linux/util-linux-2.12q-reiser_crash-1.patch
===================================================================
--- trunk/util-linux/util-linux-2.12q-reiser_crash-1.patch	2005-09-02 19:57:47 UTC (rev 1091)
+++ trunk/util-linux/util-linux-2.12q-reiser_crash-1.patch	2005-09-03 16:05:22 UTC (rev 1092)
@@ -0,0 +1,22 @@
+Submitted By: Jürg Billeter <j at bitron.ch>
+Date: 2005-09-03
+Initial Package Version: 2.12q
+Upstream Status: Submitted Upstream
+Origin: Jürg Billeter
+Description: Fix cfdisk crash occurring on some gcc 4.0 systems. See
+	http://bugs.linuxfromscratch.org/show_bug.cgi?id=1604 and
+	http://linuxfromscratch.org/pipermail/lfs-dev/2005-September/053202.html
+	for more info.
+
+diff -pur util-linux-2.12q.orig/fdisk/cfdisk.c util-linux-2.12q/fdisk/cfdisk.c
+--- util-linux-2.12q.orig/fdisk/cfdisk.c	2004-12-22 19:06:01.000000000 +0100
++++ util-linux-2.12q/fdisk/cfdisk.c	2005-09-03 10:24:19.000000000 +0200
+@@ -717,7 +717,7 @@ get_linux_label(int i) {
+ 	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
+ 		+ REISERFS_DISK_OFFSET_IN_BYTES;
+ 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
+-	    && read(fd, &reiserfsb, 1024) == 1024
++	    && read(fd, &reiserfsb, sizeof (struct reiserfs_super_block)) == sizeof (struct reiserfs_super_block)
+ 	    && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) {
+ 		if (reiserfs_is_3_6) {
+ 			/* label only on version 3.6 onward */




More information about the patches mailing list