summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
273019e)
Fix anonymous union.
Fix warnings
Workaround offsetof due to a bug in g++
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14932
Signed-off-by: Minh Diep <minh.diep@intel.com>
Change-Id: I4c1b8165ab012f4226aabb60009b48063669e271
Reviewed-on: http://review.whamcloud.com/8033
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
#ifndef __KERNEL__
#include <stdio.h>
#include <libcfs/posix/posix-types.h>
#ifndef __KERNEL__
#include <stdio.h>
#include <libcfs/posix/posix-types.h>
#endif
#include <lustre/ll_fiemap.h>
#if defined(__linux__)
#endif
#include <lustre/ll_fiemap.h>
#if defined(__linux__)
#error Unsupported operating system.
#endif
#error Unsupported operating system.
#endif
+#ifdef __cplusplus
+#define LUSTRE_ANONYMOUS_UNION_NAME u
+#else
+#define LUSTRE_ANONYMOUS_UNION_NAME
+#endif
+
/* for statfs() */
#define LL_SUPER_MAGIC 0x0BD00BD0
/* for statfs() */
#define LL_SUPER_MAGIC 0x0BD00BD0
__u64 oi_seq;
} oi;
struct lu_fid oi_fid;
__u64 oi_seq;
} oi;
struct lu_fid oi_fid;
+ } LUSTRE_ANONYMOUS_UNION_NAME;
};
#define DOSTID LPX64":"LPU64
};
#define DOSTID LPX64":"LPU64
static inline enum hsm_event hsm_get_cl_event(__u16 flags)
{
static inline enum hsm_event hsm_get_cl_event(__u16 flags)
{
- return CLF_GET_BITS(flags, CLF_HSM_EVENT_H, CLF_HSM_EVENT_L);
+ return (enum hsm_event)CLF_GET_BITS(flags, CLF_HSM_EVENT_H,
+ CLF_HSM_EVENT_L);
}
static inline void hsm_set_cl_event(int *flags, enum hsm_event he)
}
static inline void hsm_set_cl_event(int *flags, enum hsm_event he)
#define LL_DV_WR_FLUSH (1 << 1) /* Flush all caching pages from clients */
#ifndef offsetof
#define LL_DV_WR_FLUSH (1 << 1) /* Flush all caching pages from clients */
#ifndef offsetof
-# define offsetof(typ,memb) ((unsigned long)((char *)&(((typ *)0)->memb)))
+#define offsetof(typ, memb) ((unsigned long)((char *)&(((typ *)0)->memb)))
#endif
#define dot_lustre_name ".lustre"
#endif
#define dot_lustre_name ".lustre"
-static inline char *hsm_progress_state2name(enum hsm_progress_states s)
+static inline const char *hsm_progress_state2name(enum hsm_progress_states s)
{
switch (s) {
case HPS_WAITING: return "waiting";
{
switch (s) {
case HPS_WAITING: return "waiting";
HUA_CANCEL = 14 /* cancel a request */
};
HUA_CANCEL = 14 /* cancel a request */
};
-static inline char *hsm_user_action2name(enum hsm_user_action a)
+static inline const char *hsm_user_action2name(enum hsm_user_action a)
{
switch (a) {
case HUA_NONE: return "NOOP";
{
switch (a) {
case HUA_NONE: return "NOOP";
/** Compute the current length of the provided hsm_user_request. */
static inline int hur_len(struct hsm_user_request *hur)
{
/** Compute the current length of the provided hsm_user_request. */
static inline int hur_len(struct hsm_user_request *hur)
{
- return offsetof(struct hsm_user_request,
- hur_user_item[hur->hur_request.hr_itemcount]) +
+ return offsetof(struct hsm_user_request, hur_user_item[0]) +
+ hur->hur_request.hr_itemcount * sizeof(hur->hur_user_item[0]) +
hur->hur_request.hr_data_len;
}
hur->hur_request.hr_data_len;
}
-static inline char *hsm_copytool_action2name(enum hsm_copytool_action a)
+static inline const char *hsm_copytool_action2name(enum hsm_copytool_action a)
{
switch (a) {
case HSMA_NONE: return "NOOP";
{
switch (a) {
case HSMA_NONE: return "NOOP";
}
/* Return size of an hsm_action_list */
}
/* Return size of an hsm_action_list */
-static inline int hal_size(struct hsm_action_list *hal)
+static inline size_t hal_size(struct hsm_action_list *hal)
struct hsm_action_item *hai;
sz = sizeof(*hal) + cfs_size_round(strlen(hal->hal_fsname));
hai = hai_first(hal);
struct hsm_action_item *hai;
sz = sizeof(*hal) + cfs_size_round(strlen(hal->hal_fsname));
hai = hai_first(hal);
- for (i = 0 ; i < hal->hal_count ; i++, hai = hai_next(hai))
+ for (i = 0; i < hal->hal_count ; i++, hai = hai_next(hai))
sz += cfs_size_round(hai->hai_len);
return sz;
sz += cfs_size_round(hai->hai_len);
return sz;