From 2d1615c665390a082873eb9abebe6b28d2c5d793 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Wed, 3 Sep 2008 09:12:00 +0000 Subject: [PATCH] Branch b1_6 b=16580 i=johann, shadow Fixed the build issue for sles9/ppc64. --- lustre/include/obd_class.h | 2 ++ lustre/llite/dir.c | 2 +- lustre/llite/llite_internal.h | 5 +++++ lustre/lvfs/fsfilt_ext3.c | 3 +++ lustre/obdclass/class_hash.c | 2 +- lustre/quota/Makefile.in | 1 - lustre/quota/quota_adjust_qunit.c | 1 - lustre/quota/quota_check.c | 3 --- lustre/quota/quota_ctl.c | 1 - lustre/quota/quota_interface.c | 1 - lustre/utils/lfs.c | 1 + lustre/utils/wirecheck.c | 2 +- 12 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index 994dd10..a708895 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -1385,6 +1385,7 @@ static inline int obd_notify_observer(struct obd_device *observer, return rc1 ?: rc2; } +#ifdef HAVE_QUOTA_SUPPORT static inline int obd_quotacheck(struct obd_export *exp, struct obd_quotactl *oqctl) { @@ -1442,6 +1443,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, #endif RETURN(rc); } +#endif static inline int obd_health_check(struct obd_device *obd) { diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c index a0dfa10..2a87bc1 100644 --- a/lustre/llite/dir.c +++ b/lustre/llite/dir.c @@ -871,6 +871,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file, obd_ioctl_freedata(buf, len); RETURN(rc); } +#ifdef HAVE_QUOTA_SUPPORT case OBD_IOC_QUOTACHECK: { struct obd_quotactl *oqctl; int rc, error = 0; @@ -927,7 +928,6 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file, OBD_FREE_PTR(check); RETURN(rc); } -#ifdef HAVE_QUOTA_SUPPORT case OBD_IOC_QUOTACTL: { struct if_quotactl *qctl; struct obd_quotactl *oqctl; diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index ab2ade9..1a38d4a 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -51,6 +51,11 @@ #include #include #include /* for s2sbi */ + +#ifndef HAVE_LE_TYPES +typedef __u16 __le16; +typedef __u32 __le32; +#endif /* struct lustre_intent_data { diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index 2ccee59..1490e73 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -114,6 +114,9 @@ struct fsfilt_cb_data { #ifndef EXT3_XATTR_INDEX_TRUSTED /* temporary until we hit l28 kernel */ #define EXT3_XATTR_INDEX_TRUSTED 4 #endif +#ifndef XATTR_NO_CTIME +#define XATTR_NO_CTIME 0x80 +#endif static char *fsfilt_ext3_get_label(struct super_block *sb) { diff --git a/lustre/obdclass/class_hash.c b/lustre/obdclass/class_hash.c index b9135ed..a04a10f 100644 --- a/lustre/obdclass/class_hash.c +++ b/lustre/obdclass/class_hash.c @@ -703,7 +703,7 @@ void nidstats_refcount_put(struct hlist_node * actual_hnode) /*******************************************************************************/ -#ifdef __KERNEL__ +#if defined(__KERNEL__) && defined(HAVE_QUOTA_SUPPORT) /* * define ( lqs <-> qctxt ) hash operations and function define */ diff --git a/lustre/quota/Makefile.in b/lustre/quota/Makefile.in index 112e82d..b52ddb1 100644 --- a/lustre/quota/Makefile.in +++ b/lustre/quota/Makefile.in @@ -1,5 +1,4 @@ MODULES := lquota -MODULES += quotactl_test quotacheck_test lquota-objs := quota_check.o quota_context.o quota_ctl.o quota_interface.o lquota-objs += quota_master.o quota_adjust_qunit.o lproc_quota.o diff --git a/lustre/quota/quota_adjust_qunit.c b/lustre/quota/quota_adjust_qunit.c index 5887ed1..c959bc9 100644 --- a/lustre/quota/quota_adjust_qunit.c +++ b/lustre/quota/quota_adjust_qunit.c @@ -44,7 +44,6 @@ # include # include # include -# include # include # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) # include diff --git a/lustre/quota/quota_check.c b/lustre/quota/quota_check.c index 1ddba69..468391a 100644 --- a/lustre/quota/quota_check.c +++ b/lustre/quota/quota_check.c @@ -42,9 +42,6 @@ # include # include # include -# include -# include -# include # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) # include # include diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c index d362f28..178a54e 100644 --- a/lustre/quota/quota_ctl.c +++ b/lustre/quota/quota_ctl.c @@ -44,7 +44,6 @@ # include # include # include -# include # include # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) # include diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c index 229e9e0..9149153 100644 --- a/lustre/quota/quota_interface.c +++ b/lustre/quota/quota_interface.c @@ -45,7 +45,6 @@ # include # include # include -# include # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) # include # include diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 887e793..b485984 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 59ce934..85dd1ff 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1409,7 +1409,7 @@ main(int argc, char **argv) check_lustre_disk_data(); check_ll_user_fiemap(); check_ll_fiemap_extent(); - printf("#ifdef LIBLUSTRE_POSIX_ACL\n"); + printf("#if defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL)\n"); #ifndef LIBLUSTRE_POSIX_ACL #error build generator without LIBLUSTRE_POSIX_ACL defined - produce wrong check code. #endif -- 1.8.3.1