From 388111848489ef99b1fa31ce8fef255ab9c08e84 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 21 Aug 2012 20:18:44 -0600 Subject: [PATCH] LU-1303 build: bump warning on LOD/OSP workarounds There are a number of generated compile warnings in the code that need to be fixed due to LOD/OSP workarounds that need to be removed. I've bumped the version check to version 2.3.55, to give the LOD/OSP patches a chance to land. Signed-off-by: Andreas Dilger Change-Id: I41356848d7f1d0699bb0f01cb9302012ff386bc4 Reviewed-on: http://review.whamcloud.com/3741 Tested-by: Hudson Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-version.ac | 8 ++++---- lustre/include/lustre_net.h | 2 +- lustre/llite/dir.c | 4 ++-- lustre/llite/llite_internal.h | 4 ++-- lustre/llite/llite_lib.c | 2 +- lustre/lvfs/fsfilt_ext3.c | 2 +- lustre/mdd/mdd_dir.c | 2 +- lustre/obdecho/echo_client.c | 2 +- lustre/obdfilter/filter.c | 2 +- lustre/ofd/ofd_objects.c | 2 +- lustre/osd-ldiskfs/osd_handler.c | 2 +- lustre/osd-zfs/osd_index.c | 2 +- lustre/ptlrpc/layout.c | 2 +- lustre/ptlrpc/pack_generic.c | 4 ++-- lustre/ptlrpc/sec_null.c | 4 ++-- lustre/utils/lustre_cfg.c | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac index b16cc8f..419ca49 100644 --- a/lustre/autoconf/lustre-version.ac +++ b/lustre/autoconf/lustre-version.ac @@ -5,11 +5,11 @@ m4_define([LUSTRE_FIX],[0]) dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but dnl # after following release candidate/beta would spill this warning already. -m4_define([LUSTRE_VER_ALLOWED_OFFSET],["OBD_OCD_VERSION(0,0,1,32)"]) -m4_define([LUSTRE_LIB_VER_OFFSET_WARN],["OBD_OCD_VERSION(0,0,1,32)"]) +m4_define([LUSTRE_VER_ALLOWED_OFFSET],["OBD_OCD_VERSION(0, 0, 1, 32)"]) +m4_define([LUSTRE_LIB_VER_OFFSET_WARN],["OBD_OCD_VERSION(0, 0, 1, 32)"]) -dnl # linux lustre delta is 0.2.0.0 , next major release version is ok -m4_define([LUSTRE_CLI_VER_OFFSET_WARN],["OBD_OCD_VERSION(0,2,0,0)"]) +dnl # linux lustre delta is 0.4.0.0 , next stable release version is ok +m4_define([LUSTRE_CLI_VER_OFFSET_WARN],["OBD_OCD_VERSION(0, 4, 0, 0)"]) dnl # User editable part ends here. ----------------------------------------- diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index b5d8985..a90fa50 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -1970,7 +1970,7 @@ __u32 lustre_msg_get_timeout(struct lustre_msg *msg); __u32 lustre_msg_get_service_time(struct lustre_msg *msg); char *lustre_msg_get_jobid(struct lustre_msg *msg); __u32 lustre_msg_get_cksum(struct lustre_msg *msg); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) __u32 lustre_msg_calc_cksum(struct lustre_msg *msg, int compat18); #else # warning "remove checksum compatibility support for b1_8" diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c index 9bbf2ea..f985625 100644 --- a/lustre/llite/dir.c +++ b/lustre/llite/dir.c @@ -1337,7 +1337,7 @@ out_free: OBD_FREE_PTR(check); RETURN(rc); } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) case LL_IOC_QUOTACTL_18: { /* copy the old 1.x quota struct for internal use, then copy * back into old format struct. For 1.8 compatibility. */ @@ -1390,7 +1390,7 @@ out_free: } #else #warning "remove old LL_IOC_QUOTACTL_18 compatibility code" -#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) */ +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) */ case LL_IOC_QUOTACTL: { struct if_quotactl *qctl; diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 359731e..0c9f6d6 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -1528,7 +1528,7 @@ static inline void d_lustre_revalidate(struct dentry *dentry) spin_unlock(&dentry->d_lock); } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) /* Compatibility for old (1.8) compiled userspace quota code */ struct if_quotactl_18 { __u32 qc_cmd; @@ -1544,7 +1544,7 @@ struct if_quotactl_18 { /* End compatibility for old (1.8) compiled userspace quota code */ #else #warning "remove old LL_IOC_QUOTACTL_18 compatibility code" -#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) */ +#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) */ int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf); int ll_layout_refresh(struct inode *inode, __u32 *gen); diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 1457303..c43c6a8 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -773,7 +773,7 @@ static int ll_options(char *options, int *flags) *flags &= ~tmp; goto next; } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,5,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 50, 0) tmp = ll_set_opt("acl", s1, LL_SBI_ACL); if (tmp) { /* Ignore deprecated mount option. The client will diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index 5ac2add..ca12f9a 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -555,7 +555,7 @@ static int fsfilt_ext3_setattr(struct dentry *dentry, void *handle, struct inode *inode = dentry->d_inode; int rc = 0; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) /* Try to correct for a bug in 2.1.0 (LU-221) that caused negative * timestamps to appear to be in the far future, due old timestamp * being stored on disk as an unsigned value. This fixes up any diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index 7fa3e0a..7e666eb 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -1175,7 +1175,7 @@ out_trans: stop: mdd_trans_stop(env, mdd, rc, handle); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,3,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 55, 0) if (rc == 0 && ma->ma_valid & MA_COOKIE && ma->ma_valid & MA_LOV && ma->ma_valid & MA_FLAGS && ma->ma_attr_flags & MDS_UNLINK_DESTROY) /* Since echo client is incapable of destorying ost object, diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c index 2c96cf5..63b921d 100644 --- a/lustre/obdecho/echo_client.c +++ b/lustre/obdecho/echo_client.c @@ -1816,7 +1816,7 @@ static int echo_md_destroy_internal(const struct lu_env *env, CDEBUG(D_RPCTRACE, "Start destroy object "DFID" %s %p\n", PFID(lu_object_fid(&parent->mo_lu)), lname->ln_name, parent); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,3,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 55, 0) /* After 2.4, MDT will send destroy RPC to OST directly, so no need * this flag */ ma->ma_valid |= MA_FLAGS; diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index b0e5e17..6f036a6 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -3213,7 +3213,7 @@ struct dentry *__filter_oa2dentry(struct obd_device *obd, struct ost_id *ostid, RETURN(ERR_PTR(-ENOENT)); } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) /* Try to correct for a bug in 2.1.0 (LU-221) that caused negative * timestamps to appear to be in the far future, due old timestamp * being stored on disk as an unsigned value. This fixes up any diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c index cf349ca..1f48a6c 100644 --- a/lustre/ofd/ofd_objects.c +++ b/lustre/ofd/ofd_objects.c @@ -510,7 +510,7 @@ int ofd_attr_get(const struct lu_env *env, struct ofd_object *fo, rc = dt_attr_get(env, ofd_object_child(fo), la, ofd_object_capa(env, fo)); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) /* Try to correct for a bug in 2.1.0 (LU-221) that caused * negative timestamps to appear to be in the far future, * due old timestamp being stored on disk as an unsigned value. diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 3cc6ec3..d0a162a 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -4512,7 +4512,7 @@ static int osd_prepare(const struct lu_env *env, struct lu_device *pdev, RETURN(result); } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,3,50,0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 55, 0) /* Unfortunately, the current MDD implementation relies on some specific * code to be executed in the OSD layer. Since OFD now also uses the OSD * module, we need a way to skip the metadata-specific code when running diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c index 8bc19ec..d9195a5 100644 --- a/lustre/osd-zfs/osd_index.c +++ b/lustre/osd-zfs/osd_index.c @@ -536,7 +536,7 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt, * zfs_readdir() generates ./.. on fly, but * we want own entries (.. at least) with a fid */ -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 53, 0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 55, 0) #warning "fix '.' and '..' handling" #endif diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c index fe0637c..9240384 100644 --- a/lustre/ptlrpc/layout.c +++ b/lustre/ptlrpc/layout.c @@ -831,7 +831,7 @@ EXPORT_SYMBOL(RMF_CONN); struct req_msg_field RMF_CONNECT_DATA = DEFINE_MSGF("cdata", RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */, -#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 7, 50, 0) sizeof(struct obd_connect_data), #else /* For interoperability with 1.8 and 2.0 clients/servers. diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c index d59fa98..0664de7 100644 --- a/lustre/ptlrpc/pack_generic.c +++ b/lustre/ptlrpc/pack_generic.c @@ -1323,7 +1323,7 @@ __u32 lustre_msg_get_cksum(struct lustre_msg *msg) } } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) /* * In 1.6 and 1.8 the checksum was computed only on struct ptlrpc_body as * it was in 1.6 (88 bytes, smaller than the full size in 1.8). It makes @@ -1341,7 +1341,7 @@ __u32 lustre_msg_calc_cksum(struct lustre_msg *msg) switch (msg->lm_magic) { case LUSTRE_MSG_MAGIC_V2: { struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) __u32 crc; unsigned int hsize = 4; __u32 len = compat18 ? ptlrpc_body_cksum_size_compat18 : diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c index 1cb79e3..f884574 100644 --- a/lustre/ptlrpc/sec_null.c +++ b/lustre/ptlrpc/sec_null.c @@ -104,7 +104,7 @@ int null_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req) if (req->rq_early) { cksums = lustre_msg_get_cksum(req->rq_repdata); -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) if (lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_CKSUM_INCOMPAT18) cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0); @@ -363,7 +363,7 @@ int null_authorize(struct ptlrpc_request *req) } else { __u32 cksum; -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0) if (lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_CKSUM_INCOMPAT18) cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0); diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c index b409656..d5edad2 100644 --- a/lustre/utils/lustre_cfg.c +++ b/lustre/utils/lustre_cfg.c @@ -671,7 +671,7 @@ static void lprocfs_param_pattern(const char *cmd, const char *path, char *buf, if (!warned) { fprintf(stderr, "%s: specifying parameters via " "full paths is deprecated.\n", cmd); -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2,6,50,0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 50, 0) #warning "remove deprecated full path tunable access" #endif warned = 1; -- 1.8.3.1