diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-02 15:44:48 -0700 |
| commit | 9babb37438b58e77bad04e820d5702e15b79e6a6 (patch) | |
| tree | e369da81095eca3fc155b0c02bdd4a9f06506781 /module/zfs/zap_leaf.c | |
| parent | d164b2093561a9771db07346e6fffc9ca19427a2 (diff) | |
Rebase master to b117
Diffstat (limited to 'module/zfs/zap_leaf.c')
| -rw-r--r-- | module/zfs/zap_leaf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/module/zfs/zap_leaf.c b/module/zfs/zap_leaf.c index da498b6bc..9d8354e73 100644 --- a/module/zfs/zap_leaf.c +++ b/module/zfs/zap_leaf.c @@ -19,24 +19,23 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * The 512-byte leaf is broken into 32 16-byte chunks. * chunk number n means l_chunk[n], even though the header precedes it. * the names are stored null-terminated. */ +#include <sys/spa.h> +#include <sys/dmu.h> #include <sys/zfs_context.h> +#include <sys/fs/zfs.h> #include <sys/zap.h> #include <sys/zap_impl.h> #include <sys/zap_leaf.h> -#include <sys/spa.h> -#include <sys/dmu.h> static uint16_t *zap_leaf_rehash_entry(zap_leaf_t *l, uint16_t entry); |