diff --git a/xfsprogs-64k_pagesize.patch b/xfsprogs-64k_pagesize.patch new file mode 100644 index 0000000..4219757 --- /dev/null +++ b/xfsprogs-64k_pagesize.patch @@ -0,0 +1,32 @@ +Index: libhandle/handle.c +=================================================================== +--- libhandle/handle.c.orig ++++ libhandle/handle.c +@@ -360,8 +360,11 @@ attr_list_by_handle( + + memcpy(&alhreq.pos, cursor, sizeof(alhreq.pos)); + alhreq.flags = flags; +- alhreq.buflen = bufsize; + alhreq.buffer = buf; ++ alhreq.buflen = bufsize; ++ /* prevent needless EINVAL from the kernel */ ++ if (alhreq.buflen > XATTR_LIST_MAX) ++ alhreq.buflen = XATTR_LIST_MAX; + + error = xfsctl(path, fd, XFS_IOC_ATTRLIST_BY_HANDLE, &alhreq); + +Index: libhandle/jdm.c +=================================================================== +--- libhandle/jdm.c.orig ++++ libhandle/jdm.c +@@ -166,6 +166,10 @@ jdm_attr_list( jdm_fshandle_t *fshp, + filehandle_t filehandle; + int rval; + ++ /* prevent needless EINVAL from the kernel */ ++ if (bufsz > XATTR_LIST_MAX) ++ bufsz = XATTR_LIST_MAX; ++ + jdm_fill_filehandle( &filehandle, fshandlep, statp ); + rval = attr_list_by_handle (( void * )&filehandle, + sizeof( filehandle ), diff --git a/xfsprogs.changes b/xfsprogs.changes index 90737f0..fbd3835 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 12 15:25:02 CET 2009 - mmarek@suse.cz + +- added fixes needed to run xfsdump on ia64 with 64k page size + (bnc#450668) + ------------------------------------------------------------------- Tue Dec 9 16:59:57 CET 2008 - mmarek@suse.cz diff --git a/xfsprogs.spec b/xfsprogs.spec index dd6e77b..4ee419a 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package xfsprogs (Version 2.10.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: xfsprogs BuildRequires: e2fsprogs-devel Version: 2.10.2 -Release: 1 +Release: 3 # hint for ZYPP Supplements: filesystem(xfs) AutoReqProv: on @@ -32,6 +32,7 @@ Summary: Utilities for managing the XFS file system Source0: xfsprogs_%{version}-1.tar.bz2 Patch0: xfsprogs-docdir.diff Patch1: xfsprogs-ppc64.diff +Patch2: xfsprogs-64k_pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,6 +81,7 @@ Authors: %setup -q %patch0 %patch1 +%patch2 %build %{suse_update_config -f} @@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man3/* %changelog +* Mon Jan 12 2009 mmarek@suse.cz +- added fixes needed to run xfsdump on ia64 with 64k page size + (bnc#450668) * Tue Dec 09 2008 mmarek@suse.cz - updated to version 2.10.2 (bnc#457407) - Fix an mkfs.xfs regression where -i maxpct option was ignored.