ia64/xen-unstable

view tools/libfsimage/zfs/zfs-include/zfs_acl.h @ 17566:1f24743354ea

[libfsimage/zfs] compilation fix ZFS libfsimage support.

Depending on environments, zfs libfsimage support doesn't compile.
This patch fixes it.

ia64-linux-gnu-gcc -DPIC -O2 -fomit-frame-pointer
-fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes
-Wno-unused-value -Wdeclaration-after-statement
-I/usr/ia64-linux-gnu/
sys-root/usr/include -D__XEN_TOOLS__ -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -I../../../tools/libfsimage/common/ -Werror
-Wp,-MD,.zfs_lzjb.opic.d -fPIC -c -o zfs_lzjb.opic zfs_
lzjb.c
In file included from fsys_zfs.h:41,
from zfs_lzjb.c:25:
zfs-include/zfs_acl.h:29: error: redefinition of typedef uid_t
/usr/ia64-linux-gnu/sys-root/usr/include/sys/types.h:82: error:
previous declaration of uid_t was here

This depends on how __uid_t is defined in the system header.
No file under the zfs directory uses uid_t so that just removing
the definition in the zfs_acl.h looks reasonable.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Keir Fraser <keir.fraser@citrix.com>
date Fri May 02 13:47:01 2008 +0100 (2008-05-02)
parents 64f790e90d3d
children
line source
1 /*
2 * GRUB -- GRand Unified Bootloader
3 * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program; if not, write to the Free Software
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 */
19 /*
20 * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
21 * Use is subject to license terms.
22 */
24 #ifndef _SYS_FS_ZFS_ACL_H
25 #define _SYS_FS_ZFS_ACL_H
27 typedef struct zfs_oldace {
28 uint32_t z_fuid; /* "who" */
29 uint32_t z_access_mask; /* access mask */
30 uint16_t z_flags; /* flags, i.e inheritance */
31 uint16_t z_type; /* type of entry allow/deny */
32 } zfs_oldace_t;
34 #define ACE_SLOT_CNT 6
36 typedef struct zfs_znode_acl_v0 {
37 uint64_t z_acl_extern_obj; /* ext acl pieces */
38 uint32_t z_acl_count; /* Number of ACEs */
39 uint16_t z_acl_version; /* acl version */
40 uint16_t z_acl_pad; /* pad */
41 zfs_oldace_t z_ace_data[ACE_SLOT_CNT]; /* 6 standard ACEs */
42 } zfs_znode_acl_v0_t;
44 #define ZFS_ACE_SPACE (sizeof (zfs_oldace_t) * ACE_SLOT_CNT)
46 typedef struct zfs_znode_acl {
47 uint64_t z_acl_extern_obj; /* ext acl pieces */
48 uint32_t z_acl_size; /* Number of bytes in ACL */
49 uint16_t z_acl_version; /* acl version */
50 uint16_t z_acl_count; /* ace count */
51 uint8_t z_ace_data[ZFS_ACE_SPACE]; /* space for embedded ACEs */
52 } zfs_znode_acl_t;
55 #endif /* _SYS_FS_ZFS_ACL_H */