From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH 20/21] libceph: Replace CURRENT_TIME with ktime_get_real_ts Date: Wed, 8 Jun 2016 22:05:04 -0700 Message-ID: <1465448705-25055-21-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-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: <1465448705-25055-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: Sage Weil , Arnd Bergmann , y2038@lists.linaro.org, ceph-devel@vger.kernel.org, "Yan, Zheng" , Al Viro , Thomas Gleixner , Linus Torvalds , Ilya Dryomov List-Id: ceph-devel.vger.kernel.org Q1VSUkVOVF9USU1FIGlzIG5vdCB5MjAzOCBzYWZlLgpUaGUgbWFjcm8gd2lsbCBiZSBkZWxldGVk IGFuZCBhbGwgdGhlIHJlZmVyZW5jZXMgdG8gaXQKd2lsbCBiZSByZXBsYWNlZCBieSBrdGltZV9n ZXRfKiBhcGlzLgoKc3RydWN0IHRpbWVzcGVjIGlzIGFsc28gbm90IHkyMDM4IHNhZmUuClJldGFp biB0aW1lc3BlYyBmb3IgdGltZXN0YW1wIHJlcHJlc2VudGF0aW9uIGhlcmUgYXMgY2VwaAp1c2Vz IGl0IGludGVybmFsbHkgZXZlcnl3aGVyZS4KVGhlc2UgcmVmZXJlbmNlcyB3aWxsIGJlIGNoYW5n ZWQgdG8gdXNlIHN0cnVjdCB0aW1lc3BlYzY0CmluIGEgc2VwYXJhdGUgcGF0Y2guCgpTaWduZWQt b2ZmLWJ5OiBEZWVwYSBEaW5hbWFuaSA8ZGVlcGEua2VybmVsQGdtYWlsLmNvbT4KQ2M6ICJZYW4s IFpoZW5nIiA8enlhbkByZWRoYXQuY29tPgpDYzogU2FnZSBXZWlsIDxzYWdlQHJlZGhhdC5jb20+ CkNjOiBJbHlhIERyeW9tb3YgPGlkcnlvbW92QGdtYWlsLmNvbT4KQ2M6IGNlcGgtZGV2ZWxAdmdl ci5rZXJuZWwub3JnCi0tLQogbmV0L2NlcGgvb3NkX2NsaWVudC5jIHwgNCArKy0tCiAxIGZpbGUg Y2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL25l dC9jZXBoL29zZF9jbGllbnQuYyBiL25ldC9jZXBoL29zZF9jbGllbnQuYwppbmRleCA4OTQ2OTU5 Li40NGViMmQwIDEwMDY0NAotLS0gYS9uZXQvY2VwaC9vc2RfY2xpZW50LmMKKysrIGIvbmV0L2Nl cGgvb3NkX2NsaWVudC5jCkBAIC0zNTY3LDcgKzM1NjcsNyBAQCBjZXBoX29zZGNfd2F0Y2goc3Ry dWN0IGNlcGhfb3NkX2NsaWVudCAqb3NkYywKIAljZXBoX29pZF9jb3B5KCZscmVxLT50LmJhc2Vf b2lkLCBvaWQpOwogCWNlcGhfb2xvY19jb3B5KCZscmVxLT50LmJhc2Vfb2xvYywgb2xvYyk7CiAJ bHJlcS0+dC5mbGFncyA9IENFUEhfT1NEX0ZMQUdfV1JJVEUgfCBDRVBIX09TRF9GTEFHX09ORElT SzsKLQlscmVxLT5tdGltZSA9IENVUlJFTlRfVElNRTsKKwlrdGltZV9nZXRfcmVhbF90cygmbHJl cS0+bXRpbWUpOwogCiAJbHJlcS0+cmVnX3JlcSA9IGFsbG9jX2xpbmdlcl9yZXF1ZXN0KGxyZXEp OwogCWlmICghbHJlcS0+cmVnX3JlcSkgewpAQCAtMzYyNSw3ICszNjI1LDcgQEAgaW50IGNlcGhf b3NkY191bndhdGNoKHN0cnVjdCBjZXBoX29zZF9jbGllbnQgKm9zZGMsCiAJY2VwaF9vaWRfY29w eSgmcmVxLT5yX2Jhc2Vfb2lkLCAmbHJlcS0+dC5iYXNlX29pZCk7CiAJY2VwaF9vbG9jX2NvcHko JnJlcS0+cl9iYXNlX29sb2MsICZscmVxLT50LmJhc2Vfb2xvYyk7CiAJcmVxLT5yX2ZsYWdzID0g Q0VQSF9PU0RfRkxBR19XUklURSB8IENFUEhfT1NEX0ZMQUdfT05ESVNLOwotCXJlcS0+cl9tdGlt ZSA9IENVUlJFTlRfVElNRTsKKwlrdGltZV9nZXRfcmVhbF90cygmcmVxLT5yX210aW1lKTsKIAlv c2RfcmVxX29wX3dhdGNoX2luaXQocmVxLCAwLCBscmVxLT5saW5nZXJfaWQsCiAJCQkgICAgICBD RVBIX09TRF9XQVRDSF9PUF9VTldBVENIKTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBs aXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZv L3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Al Viro , Linus Torvalds , y2038@lists.linaro.org, "Yan, Zheng" , Sage Weil , Ilya Dryomov , ceph-devel@vger.kernel.org Subject: [PATCH 20/21] libceph: Replace CURRENT_TIME with ktime_get_real_ts Date: Wed, 8 Jun 2016 22:05:04 -0700 Message-Id: <1465448705-25055-21-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-kernel-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/osd_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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