From: wkendall@sgi.com
To: xfs@oss.sgi.com
Subject: [PATCH v3 8/9] xfsrestore: remove nix_t
Date: Tue, 16 Nov 2010 09:05:10 -0600 [thread overview]
Message-ID: <20101116150705.222071282@sgi.com> (raw)
In-Reply-To: 20101116150502.179825893@sgi.com
[-- Attachment #1: nuke_nix --]
[-- Type: text/plain, Size: 9466 bytes --]
The nix_t type is a 64-bit version of a (32-bit) nh_t, created "to
facilitate conversion to a 64-bit offset." At this point there's only
one case where an nh_t is converted to an off64_t, so just do an
explicit cast in that case and remove the nix_t.
Signed-off-by: Bill Kendall <wkendall@sgi.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
---
restore/node.c | 112 ++++++++++++++++++++++-----------------------------------
1 file changed, 44 insertions(+), 68 deletions(-)
Index: xfsdump-kernel.org/restore/node.c
===================================================================
--- xfsdump-kernel.org.orig/restore/node.c
+++ xfsdump-kernel.org/restore/node.c
@@ -50,22 +50,21 @@ extern size_t pgmask;
#define HDLGENSHIFT ( NBBY * sizeof ( nh_t ) - HDLGENCNT )
#define HDLGENLOMASK ( ( 1 << HDLGENCNT ) - 1 )
#define HDLGENMASK ( HDLGENLOMASK << HDLGENSHIFT )
-#define HDLNIXCNT HDLGENSHIFT
-#define HDLNIXMASK ( ( 1 << HDLNIXCNT ) - 1 )
+#define HDLMASK ( ( 1 << HDLGENSHIFT ) - 1 )
#define HDLGETGEN( h ) ( ( u_char_t ) \
( ( ( int )h >> HDLGENSHIFT ) \
& \
HDLGENLOMASK ))
-#define HDLGETNIX( h ) ( ( nix_t )( ( int )h & HDLNIXMASK ))
+#define HDLGETNHDL( h ) ( ( nh_t )( ( int )h & HDLMASK ))
#define HDLMKHDL( g, n ) ( ( nh_t )( ( ( ( int )g << HDLGENSHIFT )\
& \
HDLGENMASK ) \
| \
- ( ( int )n & HDLNIXMASK )))
-#define NIX_MAX ( ( off64_t )HDLNIXMASK )
+ ( ( int )n & HDLMASK )))
+#define NH_MAX ( HDLMASK )
/* the housekeeping byte of each node will hold two check fields:
- * a gen count, initialized to the node ix and incremented each time a node
+ * a gen count, initialized to 0 and incremented each time a node
* is allocated, to catch re-use of stale handles; and unique pattern, to
* differentiate a valid node from random memory. two unique patterns will
* be used; one when the node is on the free list, another when it is
@@ -97,7 +96,7 @@ extern size_t pgmask;
#else /* NODECHK */
-#define NIX_MAX ( NH_NULL - 1 )
+#define NH_MAX ( NH_NULL - 1 )
#endif /* NODECHK */
@@ -106,16 +105,6 @@ extern size_t pgmask;
#define NODESPERSEG_MIN 1048576
#define WINMAP_MIN 4
-/* a node is identified internally by its index into the backing store.
- * this index is the offset of the node into the segmented portion of
- * backing store (follows the abstraction header page) divided by the
- * size of a node. a special index is reserved to represent the null
- * index. a type is defined for node index (nix_t). it is a 64 bit
- * unsigned to facilitate conversion from index to 64 bit offset.
- */
-typedef off64_t nix_t;
-#define NIX_NULL OFF64MAX
-
/* reserve the firstpage for a header to save persistent context
*/
#define NODE_HDRSZ pgsz
@@ -144,15 +133,14 @@ struct node_hdr {
size_t nh_nodealignsz;
/* user's constraint on node alignment
*/
- nix_t nh_freenix;
- /* index into backing store of first node of singly-linked
- * list of free nodes
+ nh_t nh_freenh;
+ /* handle of first node of singly-linked list of free nodes
*/
off64_t nh_firstsegoff;
/* offset into backing store of the first segment
*/
- nh_t nh_virgnix;
- /* node handle of next virgin node
+ nh_t nh_virgnh;
+ /* handle of next virgin node
*/
intgen_t nh_segixshift;
/* bitshift used to extract the segment index from an nh_t
@@ -196,7 +184,6 @@ node_map_internal( nh_t nh, void **pp )
static inline void
node_unmap_internal( nh_t nh, void **pp, bool_t freepr )
{
- nix_t nix;
#ifdef NODECHK
register u_char_t hkp;
register u_char_t hdlgen;
@@ -212,12 +199,10 @@ node_unmap_internal( nh_t nh, void **pp,
*/
#ifdef NODECHK
hdlgen = HDLGETGEN( nh );
- nix = HDLGETNIX( nh );
-#else /* NODECHK */
- nix = ( nix_t )nh;
+ nh = HDLGETNHDL( nh );
#endif /* NODECHK */
- ASSERT( nix <= NIX_MAX );
+ ASSERT( nh <= NH_MAX );
#ifdef NODECHK
hkp = *( *( u_char_t ** )pp + node_hdrp->nh_nodehkix );
@@ -235,7 +220,7 @@ node_unmap_internal( nh_t nh, void **pp,
/* unmap the window containing the node
*/
- win_unmap( nh2segix( nix ), pp ); /* zeros *pp */
+ win_unmap( nh2segix( nh ), pp ); /* zeros *pp */
}
/* ARGSUSED */
@@ -315,10 +300,10 @@ node_init( intgen_t fd,
* dirs_nondirs_cnt may be less than the number of nodes/dirents).
* Checking this here prevents potential overflow in the logic below.
*/
- if ( dirs_nondirs_cnt > NIX_MAX ) {
+ if ( dirs_nondirs_cnt > NH_MAX ) {
mlog( MLOG_NORMAL | MLOG_ERROR, _(
- "dump contains %llu inodes, restore can only handle %llu\n"),
- dirs_nondirs_cnt, NIX_MAX );
+ "dump contains %llu inodes, restore can only handle %u\n"),
+ dirs_nondirs_cnt, NH_MAX );
return BOOL_FALSE;
}
@@ -332,7 +317,7 @@ node_init( intgen_t fd,
segixshift++ );
/* rounding up to a power of 2 may have caused overflow */
- if ( ( 1ULL << segixshift ) > NIX_MAX )
+ if ( ( 1ULL << segixshift ) > NH_MAX )
segixshift--;
nodesperseg = 1UL << segixshift;
@@ -373,9 +358,9 @@ node_init( intgen_t fd,
node_hdrp->nh_winmapmax = winmapmax;
node_hdrp->nh_nodesperseg = nodesperseg;
node_hdrp->nh_nodealignsz = nodealignsz;
- node_hdrp->nh_freenix = NIX_NULL;
+ node_hdrp->nh_freenh = NH_NULL;
node_hdrp->nh_firstsegoff = off + ( off64_t )NODE_HDRSZ;
- node_hdrp->nh_virgnix = 0;
+ node_hdrp->nh_virgnh = 0;
node_hdrp->nh_segixshift = segixshift;
node_hdrp->nh_relnixmask = nodesperseg - 1;
@@ -448,7 +433,6 @@ node_sync( intgen_t fd, off64_t off )
nh_t
node_alloc( void )
{
- nix_t nix;
u_char_t *p;
nh_t nh;
#ifdef NODECHK
@@ -461,12 +445,12 @@ node_alloc( void )
* otherwise get the next one from the current virgin segment,
* or allocate a new virgin segment if the current one is depleted.
*/
- if ( node_hdrp->nh_freenix != NIX_NULL ) {
- nix_t *linkagep;
+ if ( node_hdrp->nh_freenh != NH_NULL ) {
+ nh_t *linkagep;
- nix = node_hdrp->nh_freenix;
+ nh = node_hdrp->nh_freenh;
- node_map_internal( nix, ( void ** )&p );
+ node_map_internal( nh, ( void ** )&p );
if (p == NULL)
return NH_NULL;
#ifdef NODECHK
@@ -478,18 +462,18 @@ node_alloc( void )
#endif /* NODECHK */
/* adjust the free list */
- linkagep = ( nix_t * )p;
- node_hdrp->nh_freenix = *linkagep;
+ linkagep = ( nh_t * )p;
+ node_hdrp->nh_freenh = *linkagep;
- node_unmap_internal( nix, ( void ** )&p, BOOL_TRUE );
+ node_unmap_internal( nh, ( void ** )&p, BOOL_TRUE );
} else {
- if ( nh2relnix( node_hdrp->nh_virgnix ) == 0 ) {
+ if ( nh2relnix( node_hdrp->nh_virgnh ) == 0 ) {
/* need to start a new virgin segment */
intgen_t rval;
off64_t new_seg_off =
node_hdrp->nh_firstsegoff +
- ( off64_t )nh2segix( node_hdrp->nh_virgnix ) *
+ ( off64_t )nh2segix( node_hdrp->nh_virgnh ) *
( off64_t )node_hdrp->nh_segsz;
ASSERT( new_seg_off
@@ -508,34 +492,32 @@ node_alloc( void )
mlog( MLOG_NORMAL | MLOG_WARNING | MLOG_TREE, _(
"unable to autogrow node segment %u: "
"%s (%d)\n"),
- nh2segix( node_hdrp->nh_virgnix ),
+ nh2segix( node_hdrp->nh_virgnh ),
strerror( errno ),
errno );
}
}
- nix = node_hdrp->nh_virgnix++;
+ nh = node_hdrp->nh_virgnh++;
}
/* build a handle for node
*/
- if ( nix > NIX_MAX ) {
+ if ( nh > NH_MAX ) {
mlog( MLOG_NORMAL | MLOG_ERROR, _(
"dump contains too many dirents, "
"restore can only handle %llu\n"),
- NIX_MAX );
+ NH_MAX );
return NH_NULL;
}
#ifdef NODECHK
- node_map_internal( nix , ( void ** )&p );
+ node_map_internal( nh , ( void ** )&p );
if (p == NULL)
abort();
hkpp = p + ( int )node_hdrp->nh_nodehkix;
- nh = HDLMKHDL( gen, nix );
+ nh = HDLMKHDL( gen, nh );
*hkpp = HKPMKHKP( gen, NODEUNQALCD );
- node_unmap_internal( nix, ( void ** )&p, BOOL_FALSE );
-#else /* NODECHK */
- nh = ( nh_t )nix;
+ node_unmap_internal( nh, ( void ** )&p, BOOL_FALSE );
#endif /* NODECHK */
return nh;
@@ -544,7 +526,6 @@ node_alloc( void )
void *
node_map( nh_t nh )
{
- nix_t nix;
u_char_t *p;
#ifdef NODECHK
register u_char_t hkp;
@@ -559,17 +540,15 @@ node_map( nh_t nh )
*/
#ifdef NODECHK
hdlgen = HDLGETGEN( nh );
- nix = HDLGETNIX( nh );
-#else /* NODECHK */
- nix = ( nix_t )nh;
+ nh = HDLGETNHDL( nh );
#endif /* NODECHK */
- ASSERT( nix <= NIX_MAX );
+ ASSERT( nh <= NH_MAX );
/* map in
*/
p = 0; /* keep lint happy */
- node_map_internal( nix, ( void ** )&p );
+ node_map_internal( nh, ( void ** )&p );
if (p == NULL)
return NULL;
@@ -595,9 +574,8 @@ void
node_free( nh_t *nhp )
{
nh_t nh;
- nix_t nix;
u_char_t *p;
- register nix_t *linkagep;
+ register nh_t *linkagep;
#ifdef NODECHK
register u_char_t *hkpp;
register u_char_t hdlgen;
@@ -613,12 +591,10 @@ node_free( nh_t *nhp )
*/
#ifdef NODECHK
hdlgen = HDLGETGEN( nh );
- nix = HDLGETNIX( nh );
-#else /* NODECHK */
- nix = ( nix_t )nh;
+ nh = HDLGETNHDL( nh );
#endif /* NODECHK */
- ASSERT( nix <= NIX_MAX );
+ ASSERT( nh <= NH_MAX );
/* map in
*/
@@ -642,9 +618,9 @@ node_free( nh_t *nhp )
/* put node on free list
*/
- linkagep = ( nix_t * )p;
- *linkagep = node_hdrp->nh_freenix;
- node_hdrp->nh_freenix = nix;
+ linkagep = ( nh_t * )p;
+ *linkagep = node_hdrp->nh_freenh;
+ node_hdrp->nh_freenh = nh;
/* map out
*/
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2010-11-16 15:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 15:05 [PATCH v3 0/9] xfsrestore dirent limitations and scaling issues wkendall
2010-11-16 15:05 ` [PATCH v3 1/9] xfsrestore: turn off NODECHK wkendall
2010-11-17 9:20 ` Christoph Hellwig
2010-11-16 15:05 ` [PATCH v3 2/9] xfsrestore: change nrh_t from 32 to 64 bits wkendall
2010-11-17 9:23 ` Christoph Hellwig
2010-11-16 15:05 ` [PATCH v3 3/9] xfsrestore: cache path lookups wkendall
2010-11-17 9:24 ` Christoph Hellwig
2010-11-16 15:05 ` [PATCH v3 4/9] xfsrestore: mmap dirent names for faster lookups wkendall
2010-11-17 9:34 ` Christoph Hellwig
2010-11-17 17:57 ` Bill Kendall
2010-11-16 15:05 ` [PATCH v3 5/9] xfsrestore: cleanup node allocation wkendall
2010-11-16 15:05 ` [PATCH v3 6/9] xfsrestore: fix node table setup wkendall
2010-11-16 15:05 ` [PATCH v3 7/9] xfsrestore: make node lookup more efficient wkendall
2010-11-16 19:20 ` Alex Elder
2010-11-16 15:05 ` wkendall [this message]
2010-11-17 9:37 ` [PATCH v3 8/9] xfsrestore: remove nix_t Christoph Hellwig
2010-11-16 15:05 ` [PATCH v3 9/9] xfsrestore: check for compatible xfsrestore wkendall
2010-11-17 9:38 ` Christoph Hellwig
2010-11-17 15:31 ` Bill Kendall
2010-11-23 13:44 ` Christoph Hellwig
2010-11-16 19:21 ` [PATCH v3 0/9] xfsrestore dirent limitations and scaling issues Alex Elder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101116150705.222071282@sgi.com \
--to=wkendall@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.