From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v2 21/24] libceph: Replace CURRENT_TIME with ktime_get_real_ts Date: Sun, 19 Jun 2016 17:27:20 -0700 Message-ID: <1466382443-11063-22-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tytso@mit.edu, Sage Weil , arnd@arndb.de, y2038@lists.linaro.org, ceph-devel@vger.kernel.org, "Yan, Zheng" , viro@zeniv.linux.org.uk, tglx@linutronix.de, torvalds@linux-foundation.org, Ilya Dryomov List-Id: ceph-devel.vger.kernel.org Q1VSUkVOVF9USU1FIGlzIG5vdCB5MjAzOCBzYWZlLgpUaGUgbWFjcm8gd2lsbCBiZSBkZWxldGVk IGFuZCBhbGwgdGhlIHJlZmVyZW5jZXMgdG8gaXQKd2lsbCBiZSByZXBsYWNlZCBieSBrdGltZV9n ZXRfKiBhcGlzLgoKc3RydWN0IHRpbWVzcGVjIGlzIGFsc28gbm90IHkyMDM4IHNhZmUuClJldGFp biB0aW1lc3BlYyBmb3IgdGltZXN0YW1wIHJlcHJlc2VudGF0aW9uIGhlcmUgYXMgY2VwaAp1c2Vz IGl0IGludGVybmFsbHkgZXZlcnl3aGVyZS4KVGhlc2UgcmVmZXJlbmNlcyB3aWxsIGJlIGNoYW5n ZWQgdG8gdXNlIHN0cnVjdCB0aW1lc3BlYzY0CmluIGEgc2VwYXJhdGUgcGF0Y2guCgpTaWduZWQt b2ZmLWJ5OiBEZWVwYSBEaW5hbWFuaSA8ZGVlcGEua2VybmVsQGdtYWlsLmNvbT4KQ2M6ICJZYW4s IFpoZW5nIiA8enlhbkByZWRoYXQuY29tPgpDYzogU2FnZSBXZWlsIDxzYWdlQHJlZGhhdC5jb20+ CkNjOiBJbHlhIERyeW9tb3YgPGlkcnlvbW92QGdtYWlsLmNvbT4KQ2M6IGNlcGgtZGV2ZWxAdmdl ci5rZXJuZWwub3JnCi0tLQogbmV0L2NlcGgvbWVzc2VuZ2VyLmMgIHwgNiArKysrLS0KIG5ldC9j ZXBoL29zZF9jbGllbnQuYyB8IDQgKystLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbmV0L2NlcGgvbWVzc2VuZ2VyLmMgYi9u ZXQvY2VwaC9tZXNzZW5nZXIuYwppbmRleCBhNTUwMjg5Li4xODI1ZWVkIDEwMDY0NAotLS0gYS9u ZXQvY2VwaC9tZXNzZW5nZXIuYworKysgYi9uZXQvY2VwaC9tZXNzZW5nZXIuYwpAQCAtMTM2Niw4 ICsxMzY2LDkgQEAgc3RhdGljIHZvaWQgcHJlcGFyZV93cml0ZV9rZWVwYWxpdmUoc3RydWN0IGNl cGhfY29ubmVjdGlvbiAqY29uKQogCWRvdXQoInByZXBhcmVfd3JpdGVfa2VlcGFsaXZlICVwXG4i LCBjb24pOwogCWNvbl9vdXRfa3ZlY19yZXNldChjb24pOwogCWlmIChjb24tPnBlZXJfZmVhdHVy ZXMgJiBDRVBIX0ZFQVRVUkVfTVNHUl9LRUVQQUxJVkUyKSB7Ci0JCXN0cnVjdCB0aW1lc3BlYyBu b3cgPSBDVVJSRU5UX1RJTUU7CisJCXN0cnVjdCB0aW1lc3BlYyBub3c7CiAKKwkJa3RpbWVfZ2V0 X3JlYWxfdHMoJm5vdyk7CiAJCWNvbl9vdXRfa3ZlY19hZGQoY29uLCBzaXplb2YodGFnX2tlZXBh bGl2ZTIpLCAmdGFnX2tlZXBhbGl2ZTIpOwogCQljZXBoX2VuY29kZV90aW1lc3BlYygmY29uLT5v dXRfdGVtcF9rZWVwYWxpdmUyLCAmbm93KTsKIAkJY29uX291dF9rdmVjX2FkZChjb24sIHNpemVv Zihjb24tPm91dF90ZW1wX2tlZXBhbGl2ZTIpLApAQCAtMzE0OSw4ICszMTUwLDkgQEAgYm9vbCBj ZXBoX2Nvbl9rZWVwYWxpdmVfZXhwaXJlZChzdHJ1Y3QgY2VwaF9jb25uZWN0aW9uICpjb24sCiB7 CiAJaWYgKGludGVydmFsID4gMCAmJgogCSAgICAoY29uLT5wZWVyX2ZlYXR1cmVzICYgQ0VQSF9G RUFUVVJFX01TR1JfS0VFUEFMSVZFMikpIHsKLQkJc3RydWN0IHRpbWVzcGVjIG5vdyA9IENVUlJF TlRfVElNRTsKKwkJc3RydWN0IHRpbWVzcGVjIG5vdzsKIAkJc3RydWN0IHRpbWVzcGVjIHRzOwor CQlrdGltZV9nZXRfcmVhbF90cygmbm93KTsKIAkJamlmZmllc190b190aW1lc3BlYyhpbnRlcnZh bCwgJnRzKTsKIAkJdHMgPSB0aW1lc3BlY19hZGQoY29uLT5sYXN0X2tlZXBhbGl2ZV9hY2ssIHRz KTsKIAkJcmV0dXJuIHRpbWVzcGVjX2NvbXBhcmUoJm5vdywgJnRzKSA+PSAwOwpkaWZmIC0tZ2l0 IGEvbmV0L2NlcGgvb3NkX2NsaWVudC5jIGIvbmV0L2NlcGgvb3NkX2NsaWVudC5jCmluZGV4IDg5 NDY5NTkuLjQ0ZWIyZDAgMTAwNjQ0Ci0tLSBhL25ldC9jZXBoL29zZF9jbGllbnQuYworKysgYi9u ZXQvY2VwaC9vc2RfY2xpZW50LmMKQEAgLTM1NjcsNyArMzU2Nyw3IEBAIGNlcGhfb3NkY193YXRj aChzdHJ1Y3QgY2VwaF9vc2RfY2xpZW50ICpvc2RjLAogCWNlcGhfb2lkX2NvcHkoJmxyZXEtPnQu YmFzZV9vaWQsIG9pZCk7CiAJY2VwaF9vbG9jX2NvcHkoJmxyZXEtPnQuYmFzZV9vbG9jLCBvbG9j KTsKIAlscmVxLT50LmZsYWdzID0gQ0VQSF9PU0RfRkxBR19XUklURSB8IENFUEhfT1NEX0ZMQUdf T05ESVNLOwotCWxyZXEtPm10aW1lID0gQ1VSUkVOVF9USU1FOworCWt0aW1lX2dldF9yZWFsX3Rz KCZscmVxLT5tdGltZSk7CiAKIAlscmVxLT5yZWdfcmVxID0gYWxsb2NfbGluZ2VyX3JlcXVlc3Qo bHJlcSk7CiAJaWYgKCFscmVxLT5yZWdfcmVxKSB7CkBAIC0zNjI1LDcgKzM2MjUsNyBAQCBpbnQg Y2VwaF9vc2RjX3Vud2F0Y2goc3RydWN0IGNlcGhfb3NkX2NsaWVudCAqb3NkYywKIAljZXBoX29p ZF9jb3B5KCZyZXEtPnJfYmFzZV9vaWQsICZscmVxLT50LmJhc2Vfb2lkKTsKIAljZXBoX29sb2Nf Y29weSgmcmVxLT5yX2Jhc2Vfb2xvYywgJmxyZXEtPnQuYmFzZV9vbG9jKTsKIAlyZXEtPnJfZmxh Z3MgPSBDRVBIX09TRF9GTEFHX1dSSVRFIHwgQ0VQSF9PU0RfRkxBR19PTkRJU0s7Ci0JcmVxLT5y X210aW1lID0gQ1VSUkVOVF9USU1FOworCWt0aW1lX2dldF9yZWFsX3RzKCZyZXEtPnJfbXRpbWUp OwogCW9zZF9yZXFfb3Bfd2F0Y2hfaW5pdChyZXEsIDAsIGxyZXEtPmxpbmdlcl9pZCwKIAkJCSAg ICAgIENFUEhfT1NEX1dBVENIX09QX1VOV0FUQ0gpOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWTIwMzggbWFpbGluZyBsaXN0Clky MDM4QGxpc3RzLmxpbmFyby5vcmcKaHR0cHM6Ly9saXN0cy5saW5hcm8ub3JnL21haWxtYW4vbGlz dGluZm8veTIwMzgK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:35496 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbcFTBdb (ORCPT ); Sun, 19 Jun 2016 21:33:31 -0400 From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org, tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org, "Yan, Zheng" , Sage Weil , Ilya Dryomov , ceph-devel@vger.kernel.org Subject: [PATCH v2 21/24] libceph: Replace CURRENT_TIME with ktime_get_real_ts Date: Sun, 19 Jun 2016 17:27:20 -0700 Message-Id: <1466382443-11063-22-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: CURRENT_TIME is not y2038 safe. The macro will be deleted and all the references to it will be replaced by ktime_get_* apis. struct timespec is also not y2038 safe. Retain timespec for timestamp representation here as ceph uses it internally everywhere. These references will be changed to use struct timespec64 in a separate patch. Signed-off-by: Deepa Dinamani Cc: "Yan, Zheng" Cc: Sage Weil Cc: Ilya Dryomov Cc: ceph-devel@vger.kernel.org --- net/ceph/messenger.c | 6 ++++-- net/ceph/osd_client.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index a550289..1825eed 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1366,8 +1366,9 @@ static void prepare_write_keepalive(struct ceph_connection *con) dout("prepare_write_keepalive %p\n", con); con_out_kvec_reset(con); if (con->peer_features & CEPH_FEATURE_MSGR_KEEPALIVE2) { - struct timespec now = CURRENT_TIME; + struct timespec now; + ktime_get_real_ts(&now); con_out_kvec_add(con, sizeof(tag_keepalive2), &tag_keepalive2); ceph_encode_timespec(&con->out_temp_keepalive2, &now); con_out_kvec_add(con, sizeof(con->out_temp_keepalive2), @@ -3149,8 +3150,9 @@ bool ceph_con_keepalive_expired(struct ceph_connection *con, { if (interval > 0 && (con->peer_features & CEPH_FEATURE_MSGR_KEEPALIVE2)) { - struct timespec now = CURRENT_TIME; + struct timespec now; struct timespec ts; + ktime_get_real_ts(&now); jiffies_to_timespec(interval, &ts); ts = timespec_add(con->last_keepalive_ack, ts); return timespec_compare(&now, &ts) >= 0; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 8946959..44eb2d0 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -3567,7 +3567,7 @@ ceph_osdc_watch(struct ceph_osd_client *osdc, ceph_oid_copy(&lreq->t.base_oid, oid); ceph_oloc_copy(&lreq->t.base_oloc, oloc); lreq->t.flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK; - lreq->mtime = CURRENT_TIME; + ktime_get_real_ts(&lreq->mtime); lreq->reg_req = alloc_linger_request(lreq); if (!lreq->reg_req) { @@ -3625,7 +3625,7 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc, ceph_oid_copy(&req->r_base_oid, &lreq->t.base_oid); ceph_oloc_copy(&req->r_base_oloc, &lreq->t.base_oloc); req->r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK; - req->r_mtime = CURRENT_TIME; + ktime_get_real_ts(&req->r_mtime); osd_req_op_watch_init(req, 0, lreq->linger_id, CEPH_OSD_WATCH_OP_UNWATCH); -- 1.9.1