Skip to content

Commit

Permalink
staging/lustre: fix build on s390
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peng Tao authored and Greg Kroah-Hartman committed Jul 23, 2013
1 parent 3867ea5 commit 0e145b4
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions drivers/staging/lustre/lustre/include/linux/lustre_user.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 0e145b4

Please sign in to comment.