[PATCH] fix libfsimage xfs compilation fix (was Re: [Xen-devel] [PATCH] Add ZFS libfsimage support patch)

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1209698086 -32400
# Node ID 96a1821bb35598ba14345e616c9bdd8b09f090c1
# Parent  64f790e90d3d4797e298cc5abdfc54cb943687f3
[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>

diff --git a/tools/libfsimage/zfs/zfs-include/zfs_acl.h 
b/tools/libfsimage/zfs/zfs-include/zfs_acl.h
--- a/tools/libfsimage/zfs/zfs-include/zfs_acl.h
+++ b/tools/libfsimage/zfs/zfs-include/zfs_acl.h
@@ -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" */


-- 
yamahata

Attachment: 17558_96a1821bb355_zfs_compilation_fix.patch
Description: Text Data

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