From f3d2101a3c7c9811253fc65b396e30b769dffdb8 Mon Sep 17 00:00:00 2001 From: vitaly Date: Thu, 13 Jul 2006 14:06:30 +0000 Subject: [PATCH] Branch b1_5 b= r=adilger use 64bit jiffies for statfs and use 64bit compare methods for them instead of direct comparition --- lustre/include/linux/lustre_fsfilt.h | 8 ++++---- lustre/include/obd.h | 7 +++---- lustre/include/obd_class.h | 24 ++++++++---------------- lustre/liblustre/super.c | 2 +- lustre/llite/llite_lib.c | 6 +++--- lustre/llite/lproc_llite.c | 12 ++++++------ lustre/lov/lov_obd.c | 10 +++++----- lustre/lov/lov_request.c | 4 ++-- lustre/mdc/mdc_request.c | 2 +- lustre/mds/handler.c | 4 ++-- lustre/obdclass/lprocfs_status.c | 12 ++++++------ lustre/obdclass/obd_config.c | 2 +- lustre/obdfilter/filter.c | 4 ++-- lustre/obdfilter/filter_io.c | 5 +++-- lustre/osc/osc_request.c | 5 ++--- lustre/ost/ost_handler.c | 2 +- lustre/ptlrpc/import.c | 7 ++++--- 17 files changed, 54 insertions(+), 62 deletions(-) diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 637da54..97aaee1 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -332,16 +332,16 @@ static inline int fsfilt_add_journal_cb(struct obd_device *obd, __u64 last_rcvd, /* very similar to obd_statfs(), but caller already holds obd_osfs_lock */ static inline int fsfilt_statfs(struct obd_device *obd, struct super_block *sb, - cfs_time_t max_age) + __u64 max_age) { int rc = 0; - CDEBUG(D_SUPER, "osfs "CFS_TIME_T", max_age "CFS_TIME_T"\n", + CDEBUG(D_SUPER, "osfs "LPU64", max_age "LPU64"\n", obd->obd_osfs_age, max_age); - if (time_before_64(obd->obd_osfs_age, max_age)) { + if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { rc = obd->obd_fsops->fs_statfs(sb, &obd->obd_osfs); if (rc == 0) /* N.B. statfs can't really fail */ - obd->obd_osfs_age = get_jiffies_64(); + obd->obd_osfs_age = cfs_time_current_64(); } else { CDEBUG(D_SUPER, "using cached obd_statfs data\n"); } diff --git a/lustre/include/obd.h b/lustre/include/obd.h index dad5d7d..d50cf56 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -759,7 +759,7 @@ struct obd_device { struct fsfilt_operations *obd_fsops; spinlock_t obd_osfs_lock; struct obd_statfs obd_osfs; /* locked by obd_osfs_lock */ - cfs_time_t obd_osfs_age; + __u64 obd_osfs_age; struct lvfs_run_ctxt obd_lvfs_ctxt; struct llog_ctxt *obd_llog_ctxt[LLOG_MAX_CTXTS]; struct obd_device *obd_observer; @@ -865,10 +865,9 @@ struct obd_ops { int (*o_disconnect)(struct obd_export *exp); int (*o_statfs)(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age); + __u64 max_age); int (*o_statfs_async)(struct obd_device *obd, struct obd_info *oinfo, - cfs_time_t max_age, - struct ptlrpc_request_set *set); + __u64 max_age, struct ptlrpc_request_set *set); int (*o_packmd)(struct obd_export *exp, struct lov_mds_md **disk_tgt, struct lov_stripe_md *mem_src); int (*o_unpackmd)(struct obd_export *exp,struct lov_stripe_md **mem_tgt, diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index 464f4c0..23f7f55 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -689,20 +689,12 @@ obd_lvfs_fid2dentry(struct obd_export *exp, __u64 id_ino, __u32 gen, __u64 gr) #define time_before(t1, t2) ((long)t2 - (long)t1 > 0) #endif -#ifndef time_before_64 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -#define time_before_64(t1, t2) ((__s64)t2 - (__s64)t1 > 0) -#else -#define time_before_64 time_before -#endif -#endif - /* @max_age is the oldest time in jiffies that we accept using a cached data. * If the cache is older than @max_age we will get a new value from the * target. Use a value of "cfs_time_current() + HZ" to guarantee freshness. */ static inline int obd_statfs_async(struct obd_device *obd, struct obd_info *oinfo, - cfs_time_t max_age, + __u64 max_age, struct ptlrpc_request_set *rqset) { int rc = 0; @@ -714,9 +706,9 @@ static inline int obd_statfs_async(struct obd_device *obd, OBD_CHECK_OP(obd, statfs, -EOPNOTSUPP); OBD_COUNTER_INCREMENT(obd, statfs); - CDEBUG(D_SUPER, "osfs "CFS_TIME_T", max_age "CFS_TIME_T"\n", + CDEBUG(D_SUPER, "osfs "LPU64", max_age "LPU64"\n", obd->obd_osfs_age, max_age); - if (cfs_time_before(obd->obd_osfs_age, max_age)) { + if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { rc = OBP(obd, statfs_async)(obd, oinfo, max_age, rqset); } else { CDEBUG(D_SUPER, "using cached obd_statfs data\n"); @@ -730,7 +722,7 @@ static inline int obd_statfs_async(struct obd_device *obd, } static inline int obd_statfs_rqset(struct obd_device *obd, - struct obd_statfs *osfs, cfs_time_t max_age) + struct obd_statfs *osfs, __u64 max_age) { struct ptlrpc_request_set *set = NULL; struct obd_info oinfo = { { { 0 } } }; @@ -753,7 +745,7 @@ static inline int obd_statfs_rqset(struct obd_device *obd, * If the cache is older than @max_age we will get a new value from the * target. Use a value of "cfs_time_current() + HZ" to guarantee freshness. */ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { int rc = 0; ENTRY; @@ -764,14 +756,14 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, OBD_CHECK_OP(obd, statfs, -EOPNOTSUPP); OBD_COUNTER_INCREMENT(obd, statfs); - CDEBUG(D_SUPER, "osfs "CFS_TIME_T", max_age "CFS_TIME_T"\n", + CDEBUG(D_SUPER, "osfs "LPU64", max_age "LPU64"\n", obd->obd_osfs_age, max_age); - if (cfs_time_before(obd->obd_osfs_age, max_age)) { + if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { rc = OBP(obd, statfs)(obd, osfs, max_age); if (rc == 0) { spin_lock(&obd->obd_osfs_lock); memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs)); - obd->obd_osfs_age = cfs_time_current(); + obd->obd_osfs_age = cfs_time_current_64(); spin_unlock(&obd->obd_osfs_lock); } } else { diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c index c96b81d..b7012e9 100644 --- a/lustre/liblustre/super.c +++ b/lustre/liblustre/super.c @@ -1168,7 +1168,7 @@ static int llu_statfs(struct llu_sb_info *sbi, struct statfs *sfs) /* For now we will always get up-to-date statfs values, but in the * future we may allow some amount of caching on the client (e.g. * from QOS or lprocfs updates). */ - rc = llu_statfs_internal(sbi, &osfs, get_jiffies_64() - HZ); + rc = llu_statfs_internal(sbi, &osfs, cfs_time_current_64() - HZ); if (rc) return rc; diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 723db1f..f12a096 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -169,7 +169,7 @@ int client_common_fill_super(struct super_block *sb, char *mdc, char *osc) } sbi->ll_mdc_exp = class_conn2export(&mdc_conn); - err = obd_statfs(obd, &osfs, get_jiffies_64() - HZ); + err = obd_statfs(obd, &osfs, cfs_time_current_64() - HZ); if (err) GOTO(out_mdc, err); @@ -1407,7 +1407,7 @@ int ll_statfs(struct super_block *sb, struct kstatfs *sfs) /* For now we will always get up-to-date statfs values, but in the * future we may allow some amount of caching on the client (e.g. * from QOS or lprocfs updates). */ - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - 1); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - 1); if (rc) return rc; @@ -1913,7 +1913,7 @@ int ll_obd_statfs(struct inode *inode, void *arg) if (!client_obd) GOTO(out_statfs, rc = -EINVAL); - rc = obd_statfs(client_obd, &stat_buf, get_jiffies_64() - 1); + rc = obd_statfs(client_obd, &stat_buf, cfs_time_current_64() - 1); if (rc) GOTO(out_statfs, rc); diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c index ddc1847..fc190df 100644 --- a/lustre/llite/lproc_llite.c +++ b/lustre/llite/lproc_llite.c @@ -46,7 +46,7 @@ static int ll_rd_blksize(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, "%u\n", osfs.os_bsize); @@ -63,7 +63,7 @@ static int ll_rd_kbytestotal(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_blocks; @@ -86,7 +86,7 @@ static int ll_rd_kbytesfree(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_bfree; @@ -108,7 +108,7 @@ static int ll_rd_kbytesavail(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_bavail; @@ -130,7 +130,7 @@ static int ll_rd_filestotal(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, LPU64"\n", osfs.os_files); @@ -146,7 +146,7 @@ static int ll_rd_filesfree(char *page, char **start, off_t off, int count, int rc; LASSERT(sb != NULL); - rc = ll_statfs_internal(sb, &osfs, get_jiffies_64() - HZ); + rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, LPU64"\n", osfs.os_ffree); diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index d5a2a0e..a4fca4c 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -974,9 +974,9 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa, struct lov_obd *lov; struct obd_info oinfo; struct lov_request_set *set = NULL; - struct obd_statfs osfs; - unsigned long maxage; struct lov_request *req; + struct obd_statfs osfs; + __u64 maxage; int rc = 0; ENTRY; @@ -1001,7 +1001,7 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa, RETURN(rc); } - maxage = cfs_time_shift(-lov->desc.ld_qos_maxage); + maxage = cfs_time_shift_64(-lov->desc.ld_qos_maxage); obd_statfs_rqset(exp->exp_obd, &osfs, maxage); rc = lov_prep_create_set(exp, &oinfo, ea, src_oa, oti, &set); @@ -2084,7 +2084,7 @@ static int lov_statfs_interpret(struct ptlrpc_request_set *rqset, } static int lov_statfs_async(struct obd_device *obd, struct obd_info *oinfo, - cfs_time_t max_age, struct ptlrpc_request_set *rqset) + __u64 max_age, struct ptlrpc_request_set *rqset) { struct lov_request_set *set; struct lov_request *req; @@ -2126,7 +2126,7 @@ static int lov_statfs_async(struct obd_device *obd, struct obd_info *oinfo, } static int lov_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { struct lov_obd *lov = &obd->u.lov; struct obd_statfs lov_sfs; diff --git a/lustre/lov/lov_request.c b/lustre/lov/lov_request.c index e31dceb..a46f5c2 100644 --- a/lustre/lov/lov_request.c +++ b/lustre/lov/lov_request.c @@ -1403,7 +1403,7 @@ int lov_fini_statfs(struct obd_device *obd, struct obd_statfs *osfs,int success) spin_lock(&obd->obd_osfs_lock); memcpy(&obd->obd_osfs, osfs, sizeof(osfs)); - obd->obd_osfs_age = get_jiffies_64(); + obd->obd_osfs_age = cfs_time_current_64(); spin_unlock(&obd->obd_osfs_lock); RETURN(0); } @@ -1435,7 +1435,7 @@ void lov_update_statfs(struct obd_device *obd, struct obd_statfs *osfs, { spin_lock(&obd->obd_osfs_lock); memcpy(&obd->obd_osfs, lov_sfs, sizeof(osfs)); - obd->obd_osfs_age = get_jiffies_64(); + obd->obd_osfs_age = cfs_time_current_64(); spin_unlock(&obd->obd_osfs_lock); if (success == 0) { diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index 25e3454..37689aa 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -932,7 +932,7 @@ int mdc_get_info(struct obd_export *exp, __u32 keylen, void *key, } static int mdc_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { struct ptlrpc_request *req; struct obd_statfs *msfs; diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index 1d87137..d185972d 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -1017,7 +1017,7 @@ out_ucred: } static int mds_obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { int rc; @@ -1050,7 +1050,7 @@ static int mds_statfs(struct ptlrpc_request *req) /* We call this so that we can cache a bit - 1 jiffie worth */ rc = mds_obd_statfs(obd, lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, size[REPLY_REC_OFF]), - cfs_time_current() - HZ); + cfs_time_current_64() - HZ); if (rc) { CERROR("mds_obd_statfs failed: rc %d\n", rc); GOTO(out, rc); diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index e09874e..866cf6a 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -230,7 +230,7 @@ int lprocfs_rd_blksize(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, "%u\n", osfs.os_bsize); @@ -242,7 +242,7 @@ int lprocfs_rd_kbytestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_blocks; @@ -260,7 +260,7 @@ int lprocfs_rd_kbytesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_bfree; @@ -278,7 +278,7 @@ int lprocfs_rd_kbytesavail(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; __u64 result = osfs.os_bavail; @@ -296,7 +296,7 @@ int lprocfs_rd_filestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, LPU64"\n", osfs.os_files); @@ -309,7 +309,7 @@ int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, get_jiffies_64() - HZ); + int rc = obd_statfs(data, &osfs, cfs_time_current_64() - HZ); if (!rc) { *eof = 1; rc = snprintf(page, count, LPU64"\n", osfs.os_ffree); diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c index 7e76d70..ffd79c1 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -188,7 +188,7 @@ int class_attach(struct lustre_cfg *lcfg) spin_lock_init(&obd->obd_osfs_lock); /* obd->obd_osfs_age must be set to a value in the distant * past to guarantee a fresh statfs is fetched on mount. */ - obd->obd_osfs_age = cfs_time_shift(-1000); + obd->obd_osfs_age = cfs_time_shift_64(-1000); /* XXX belongs in setup not attach */ /* recovery data */ diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index bc74412..43fb830 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -2672,7 +2672,7 @@ out: } static int filter_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { struct filter_obd *filter = &obd->u.filter; int blockbits = obd->u.obt.obt_sb->s_blocksize_bits; @@ -2741,7 +2741,7 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa, OBD_ALLOC(osfs, sizeof(*osfs)); if (osfs == NULL) RETURN(-ENOMEM); - rc = filter_statfs(obd, osfs, get_jiffies_64() - HZ); + rc = filter_statfs(obd, osfs, cfs_time_current_64() - HZ); if (rc == 0 && osfs->os_bavail < (osfs->os_blocks >> 10)) { CDEBUG(D_HA, "OST out of space! avail "LPU64"\n", osfs->os_bavail << diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 66d4f3f..38efbc2 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -160,9 +160,10 @@ obd_size filter_grant_space_left(struct obd_export *exp) LASSERT_SPIN_LOCKED(&obd->obd_osfs_lock); - if (time_before_64(obd->obd_osfs_age, get_jiffies_64() - HZ)) { + if (cfs_time_before_64(obd->obd_osfs_age, cfs_time_current_64() - HZ)) { restat: - rc = fsfilt_statfs(obd, obd->u.obt.obt_sb, get_jiffies_64() + HZ); + rc = fsfilt_statfs(obd, obd->u.obt.obt_sb, + cfs_time_current_64() + HZ); if (rc) /* N.B. statfs can't really fail */ RETURN(0); statfs_done = 1; diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 543c156..1ecf81d 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3075,8 +3075,7 @@ out: } static int osc_statfs_async(struct obd_device *obd, struct obd_info *oinfo, - cfs_time_t max_age, - struct ptlrpc_request_set *rqset) + __u64 max_age, struct ptlrpc_request_set *rqset) { struct ptlrpc_request *req; struct osc_async_args *aa; @@ -3107,7 +3106,7 @@ static int osc_statfs_async(struct obd_device *obd, struct obd_info *oinfo, } static int osc_statfs(struct obd_device *obd, struct obd_statfs *osfs, - cfs_time_t max_age) + __u64 max_age) { struct obd_statfs *msfs; struct ptlrpc_request *req; diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index 5aff53a..9c37f9d 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -139,7 +139,7 @@ static int ost_statfs(struct ptlrpc_request *req) osfs = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*osfs)); req->rq_status = obd_statfs(req->rq_export->exp_obd, osfs, - get_jiffies_64() - HZ); + cfs_time_current_64() - HZ); if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_OST_ENOSPC)) osfs->os_bfree = osfs->os_bavail = 64; if (req->rq_status != 0) diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 5a2d9cc..d31941e 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -265,8 +265,9 @@ static int import_select_connection(struct obd_import *imp) imp->imp_obd->obd_name, libcfs_nid2str(conn->oic_conn->c_peer.nid), conn->oic_last_attempt); - if (get_jiffies_64() > - conn->oic_last_attempt + RECONNECT_INTERVAL * HZ) { + if (cfs_time_before_64(conn->oic_last_attempt + + RECONNECT_INTERVAL * HZ, + cfs_time_current_64())) { /* If we have never tried this connection since the the last successful attempt, go with this one */ if (conn->oic_last_attempt <= @@ -294,7 +295,7 @@ static int import_select_connection(struct obd_import *imp) } LASSERT(imp_conn->oic_conn); - imp_conn->oic_last_attempt = get_jiffies_64(); + imp_conn->oic_last_attempt = cfs_time_current_64(); /* switch connection, don't mind if it's same as the current one */ if (imp->imp_connection) -- 1.8.3.1