From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Peng Tao <bergwolf@gmail.com>,
Peng Tao <tao.peng@emc.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH-v2 08/17] staging/lustre: fix build on s390
Date: Mon, 15 Jul 2013 21:08:06 +0800 [thread overview]
Message-ID: <1373893695-4094-9-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1373893695-4094-1-git-send-email-bergwolf@gmail.com>
As reported by Fengguang:
In file included from drivers/staging/lustre/lustre/obdclass/../include/lustre/lustre_idl.h:99:0,
from drivers/staging/lustre/lustre/obdclass/../include/lprocfs_status.h:46,
from drivers/staging/lustre/lustre/obdclass/../include/obd_support.h:42,
from drivers/staging/lustre/lustre/obdclass/../include/obd_class.h:40,
from drivers/staging/lustre/lustre/obdclass/lu_object.c:53:
drivers/staging/lustre/lustre/obdclass/../include/lustre/lustre_user.h:356:10: error: field 'lmd_st' has incomplete type
drivers/staging/lustre/lustre/obdclass/../include/lustre/lustre_user.h:361:10: error: field 'lmd_st' has incomplete type
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
.../lustre/lustre/include/linux/lustre_user.h | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_user.h b/drivers/staging/lustre/lustre/include/linux/lustre_user.h
index ebaf929..ea9393c 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_user.h
@@ -53,15 +53,19 @@
#include <linux/string.h>
-#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || \
- defined(__craynv) || defined (__mips64__) || defined(__powerpc64__)
-typedef struct stat lstat_t;
-#define lstat_f lstat
-#define HAVE_LOV_USER_MDS_DATA
-#else
+/*
+ * We need to always use 64bit version because the structure
+ * is shared across entire cluster where 32bit and 64bit machines
+ * are co-existing.
+ */
+#if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)
typedef struct stat64 lstat_t;
#define lstat_f lstat64
-#define HAVE_LOV_USER_MDS_DATA
+#else
+typedef struct stat lstat_t;
+#define lstat_f lstat
#endif
+#define HAVE_LOV_USER_MDS_DATA
+
#endif /* _LUSTRE_USER_H */
--
1.7.9.5
next prev parent reply other threads:[~2013-07-15 13:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 13:07 [PATCH-v2 00/17] staging/lustre: fix various build issues Peng Tao
2013-07-15 13:07 ` [PATCH-v2 01/17] staging/lustre: replace num_physpages with totalram_pages Peng Tao
2013-07-15 13:08 ` [PATCH-v2 02/17] staging/lustre: fix Lustre code link order Peng Tao
2013-07-15 13:08 ` [PATCH-v2 03/17] staging/lustre: don't assert module owner Peng Tao
2013-07-15 13:08 ` [PATCH-v2 04/17] staging/lustre: don't assert ln_refcount in LNetGetId Peng Tao
2013-07-15 13:08 ` [PATCH-v2 05/17] stating/lustre: only build if configured as module Peng Tao
2013-07-15 13:08 ` [PATCH-v2 06/17] staging/lustre: remove HIPQUAD Peng Tao
2013-07-15 13:38 ` Joe Perches
2013-07-15 14:08 ` Peng Tao
2013-07-15 13:08 ` [PATCH-v2 07/17] staging/lustre: fix build error when !CONFIG_SMP Peng Tao
2013-07-15 13:08 ` Peng Tao [this message]
2013-07-15 13:08 ` [PATCH-v2 09/17] staging/lustre/llite: add missing include file for prefetchw Peng Tao
2013-07-15 13:08 ` [PATCH-v2 10/17] staging/lustre/llite: fix build erorr if CONFIG_FS_POSIX_ACL is off Peng Tao
2013-07-15 13:08 ` [PATCH-v2 11/17] staging/lustre: fix build when CONFIG_UIDGID_STRICT_TYPE_CHECKS is on Peng Tao
2013-07-15 13:08 ` [PATCH-v2 12/17] staging/lustre: fix build error on non-x86 platforms Peng Tao
2013-07-15 13:08 ` [PATCH-v2 13/17] staging/lustre: fix build warnning on 32bit system Peng Tao
2013-07-15 13:08 ` [PATCH-v2 14/17] staging/lustre: fix for invalidatepage() API change Peng Tao
2013-07-15 13:08 ` [PATCH-v2 15/17] staging/lustre/llite: fix for d_compare " Peng Tao
2013-07-15 13:08 ` [PATCH-v2 16/17] staging/lustre/llite: readdir convert to iterate Peng Tao
2013-07-15 13:08 ` [PATCH-v2 17/17] staging/lustre: drop CONFIG_BROKEN Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373893695-4094-9-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tao.peng@emc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox