From 9990b949f72eeec31983fc067ff102546b1ccf75d7a816b3a611f06b7734771c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 12 Jan 2009 17:23:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsdump?expand=0&rev=9 --- xfsdump-64k_pagesize.patch | 44 ++++++++++++++++++++++++++++++++++++++ xfsdump.changes | 5 +++++ xfsdump.spec | 6 +++++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 xfsdump-64k_pagesize.patch diff --git a/xfsdump-64k_pagesize.patch b/xfsdump-64k_pagesize.patch new file mode 100644 index 0000000..eb39f57 --- /dev/null +++ b/xfsdump-64k_pagesize.patch @@ -0,0 +1,44 @@ +Index: dump/content.c +=================================================================== +--- dump/content.c.orig ++++ dump/content.c +@@ -210,7 +210,7 @@ typedef struct extent_group_context exte + + /* minimum sizes for extended attributes buffers + */ +-#define EXTATTR_LISTBUF_SZ ( 4 * pgsz ) ++#define EXTATTR_LISTBUF_SZ ( XATTR_LIST_MAX ) + #define EXTATTR_RTRVARRAY_LEN ( 1 * pgsz ) + #define EXTATTR_DUMPBUF_SZ ( 4 * pgsz ) + +Index: restore/inomap.c +=================================================================== +--- restore/inomap.c.orig ++++ restore/inomap.c +@@ -197,8 +197,6 @@ inomap_restore_pers( drive_t *drivep, + */ + ASSERT( INOPERSEG == ( sizeof( (( seg_t * )0 )->lobits ) * NBBY )); + ASSERT( sizeof( hnk_t ) == HNKSZ ); +- ASSERT( HNKSZ >= pgsz ); +- ASSERT( ! ( HNKSZ % pgsz )); + ASSERT( sizeof( pers_t ) <= PERSSZ ); + + /* get inomap info from media hdr +@@ -224,8 +222,6 @@ inomap_restore_pers( drive_t *drivep, + + /* mmap the persistent hdr and space for the map + */ +- ASSERT( sizeof( hnk_t ) * ( size_t )hnkcnt >= pgsz ); +- ASSERT( ! ( sizeof( hnk_t ) * ( size_t )hnkcnt % pgsz )); + persp = ( pers_t * ) mmap_autogrow( + PERSSZ + + +@@ -355,8 +351,6 @@ inomap_sync_pers( char *hkdir ) + /* sanity checks + */ + ASSERT( sizeof( hnk_t ) == HNKSZ ); +- ASSERT( HNKSZ >= pgsz ); +- ASSERT( ! ( HNKSZ % pgsz )); + + /* only needed once per session + */ diff --git a/xfsdump.changes b/xfsdump.changes index cdbf7c5..7b34ebc 100644 --- a/xfsdump.changes +++ b/xfsdump.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 12 15:25:37 CET 2009 - mmarek@suse.cz + +- fixed xfsdump on ia64 with 64k page size (bnc#450668) + ------------------------------------------------------------------- Tue Jan 6 14:24:40 CET 2009 - mmarek@suse.cz diff --git a/xfsdump.spec b/xfsdump.spec index 8c14911..ed9448a 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -21,7 +21,7 @@ Name: xfsdump BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel Version: 2.2.48 -Release: 43 +Release: 46 AutoReqProv: on Group: System/Filesystems License: GPL v2 or later @@ -30,6 +30,7 @@ Summary: Administrative Utilities for the XFS File System Source0: xfsdump_%version-1.tar.bz2 Patch0: xfsdump-docdir.diff Patch1: xfsdump-librmt.patch +Patch2: xfsdump-64k_pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +60,7 @@ Authors: %setup -q %patch0 %patch1 -p1 +%patch2 %build %{suse_update_config -f} @@ -89,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/* %changelog +* Mon Jan 12 2009 mmarek@suse.cz +- fixed xfsdump on ia64 with 64k page size (bnc#450668) * Tue Jan 06 2009 mmarek@suse.cz - fixed two pointer comparison errors in librmt (bnc#433393) * Thu Mar 20 2008 mmarek@suse.cz