- fix ICE on `xfs_db -c frag -r /dev/hdaX` (endian issue).

Changed files:
    xfsprogs-xfs_db-segv.patch -> 1.1
    xfsprogs.spec -> 1.70

diff --git a/xfsprogs-xfs_db-segv.patch b/xfsprogs-xfs_db-segv.patch
new file mode 100644 (file)
index 0000000..54633eb
--- /dev/null
+++ b/xfsprogs-xfs_db-segv.patch
@@ -0,0 +1,46 @@
+Date:  Mon, 24 Oct 2005 08:54:51 +1000
+From:  Nathan Scott <nathans@sgi.com>
+
+Subject: Re: xfs_db -c frag -r /dev/hda1 - Segmentation fault
+
+
+On Sun, Oct 23, 2005 at 07:39:34AM -0400, Justin Piszcz wrote:
+> p34:~# xfs_db -c frag -r /dev/hda1
+> Segmentation fault
+> p34:~# xfs_db -c frag -r /dev/hde1
+> Segmentation fault
+> p34:~# xfs_db -c frag -r /dev/hdk1
+> Segmentation fault
+> p34:~#
+> 
+> Debian Etch, 2.6.13.4, stopped working a while ago, either before newer 
+> debian packages or a newer kernel, does anyone who uses Debian+XFS have 
+> this problem as well?
+
+I see it too - this looks like an endian issue in xfs_db, this patch
+should fix it (Works For Me).
+
+cheers.
+Nathan
+
+
+--- xfsprogs.orig/db/frag.c
++++ xfsprogs/db/frag.c
+@@ -294,7 +294,7 @@ process_exinode(
+       xfs_bmbt_rec_32_t       *rp;
+ 
+       rp = (xfs_bmbt_rec_32_t *)XFS_DFORK_PTR(dip, whichfork);
+-      process_bmbt_reclist(rp, XFS_DFORK_NEXTENTS(dip, whichfork), extmapp);
++      process_bmbt_reclist(rp, XFS_DFORK_NEXTENTS_HOST(dip, whichfork), extmapp);
+ }
+ 
+ static void
+@@ -305,7 +305,7 @@ process_fork(
+       extmap_t        *extmap;
+       int             nex;
+ 
+-      nex = XFS_DFORK_NEXTENTS(dip, whichfork);
++      nex = XFS_DFORK_NEXTENTS_HOST(dip, whichfork);
+       if (!nex)
+               return;
+       extmap = extmap_alloc(nex);

diff --git a/xfsprogs.spec b/xfsprogs.spec
index b7f49831265ba6d44326a05e3d7292f738634596..5b5fc8edbfd9810f2e7a3d692aa7a1dbb01e7aa8 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -15,6 +15,7 @@ Patch0:               %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
 Patch2:                %{name}-sharedlibs.patch
 Patch3:                %{name}-cflags.patch
+Patch4:                %{name}-xfs_db-segv.patch
 URL:           http://oss.sgi.com/projects/xfs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -88,6 +89,7 @@ Biblioteki statyczne do XFS.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"