aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Goodwin <markgw@sgi.com>2009-01-08 12:37:53 +1100
committerMark Goodwin <markgw@sgi.com>2009-01-08 12:37:53 +1100
commit9502587dbbfdd465958889a568dc2842f10b1ff9 (patch)
tree70228aa39140cd701cc7e52a11d13e92693813c3
parentedd403b2c78e3df2777e41226c7305a363bdee70 (diff)
downloadxfsdump-dev-9502587dbbfdd465958889a568dc2842f10b1ff9.tar.gz
Various fixes to allow xfsdump/xfsrestore to work with 64K
page size. This is essentially Chinner's patch from a while back. Signed-off-by: Bill Kendall <wkendall@sgi.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: Mark Goodwin <markgw@sgi.com>
-rw-r--r--dump/content.c2
-rw-r--r--restore/inomap.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/dump/content.c b/dump/content.c
index b2fe92e4..7e0229e6 100644
--- a/dump/content.c
+++ b/dump/content.c
@@ -210,7 +210,7 @@ typedef struct extent_group_context extent_group_context_t;
/* 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 )
diff --git a/restore/inomap.c b/restore/inomap.c
index 632a5102..562492e6 100644
--- a/restore/inomap.c
+++ b/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
*/