[Xen-changelog] [xen-unstable] [libfsimage/zfs] compilation fix ZFS libfsimage support.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1209732421 -3600
# Node ID 1f24743354ea85d3c6485c986522cb1698169bd1
# Parent  a353dd2ab9445036351c5da5c14555b82bc85ae6
[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@xxxxxxxxxxxxx>
---
 tools/libfsimage/zfs/zfs-include/zfs_acl.h |    5 -----
 1 files changed, 5 deletions(-)

diff -r a353dd2ab944 -r 1f24743354ea tools/libfsimage/zfs/zfs-include/zfs_acl.h
--- a/tools/libfsimage/zfs/zfs-include/zfs_acl.h        Fri May 02 13:46:16 
2008 +0100
+++ b/tools/libfsimage/zfs/zfs-include/zfs_acl.h        Fri May 02 13:47:01 
2008 +0100
@@ -23,11 +23,6 @@
 
 #ifndef        _SYS_FS_ZFS_ACL_H
 #define        _SYS_FS_ZFS_ACL_H
-
-#ifndef _UID_T
-#define        _UID_T
-typedef        unsigned int uid_t;                     /* UID type */
-#endif /* _UID_T */
 
 typedef struct zfs_oldace {
        uint32_t        z_fuid;         /* "who" */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog