X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftarget%2Ftgt_main.c;h=b767d1d3931940551b97a83a8c0c8c7892c80db2;hb=e763467ebe00913e8d03f855dc4b918b95099931;hp=da09bcb8069273e0db0bd9e10ddd9424b3767e74;hpb=3cbe63e72c83ba50c3553d28e2fe6bc9d18c347a;p=fs%2Flustre-release.git diff --git a/lustre/target/tgt_main.c b/lustre/target/tgt_main.c index da09bcb..b767d1d 100644 --- a/lustre/target/tgt_main.c +++ b/lustre/target/tgt_main.c @@ -21,7 +21,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2016, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * lustre/target/tgt_main.c @@ -195,7 +195,7 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut, /* statfs data */ spin_lock_init(&tgd->tgd_osfs_lock); - tgd->tgd_osfs_age = cfs_time_shift_64(-1000); + tgd->tgd_osfs_age = ktime_get_seconds() - 1000; tgd->tgd_osfs_unstable = 0; tgd->tgd_statfs_inflight = 0; tgd->tgd_osfs_inflight = 0; @@ -252,7 +252,6 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut, /* prepare transactions callbacks */ lut->lut_txn_cb.dtc_txn_start = tgt_txn_start_cb; lut->lut_txn_cb.dtc_txn_stop = tgt_txn_stop_cb; - lut->lut_txn_cb.dtc_txn_commit = NULL; lut->lut_txn_cb.dtc_cookie = lut; lut->lut_txn_cb.dtc_tag = LCT_DT_THREAD | LCT_MD_THREAD; INIT_LIST_HEAD(&lut->lut_txn_cb.dtc_linkage);