From patchwork Mon Jun 20 00:27:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9186577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8612960871 for ; Mon, 20 Jun 2016 04:53:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77EF6223A6 for ; Mon, 20 Jun 2016 04:53:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C71823B3D; Mon, 20 Jun 2016 04:53:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CB9A228C8 for ; Mon, 20 Jun 2016 04:53:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751757AbcFTExP (ORCPT ); Mon, 20 Jun 2016 00:53:15 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:34395 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbcFTExO (ORCPT ); Mon, 20 Jun 2016 00:53:14 -0400 Received: by mail-pa0-f66.google.com with SMTP id us13so10084880pab.1 for ; Sun, 19 Jun 2016 21:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6ivnv2sSbbM5Dowzqxd2Yjh8DW5uBXNhO01SKOygBxc=; b=PNR7fNctGk0IbD5Jcg0LsBHWiFm7i+gQ8AMaOLJfOXqXLsOPAAJimmq3kMxXErdgzt LV1Ob+vWifU1XzMqIMK9Cw1Xve4djPrqZA1cIGrmetGQwv0cRGVVJRctN7m9zH9mQ38P fA9F/4olN3AJgmAvIHzeYFSWW/XVUm1O1YuRekENRQz78s90+1ciR8jQu3pS3pD6Uklb bO+SLih6RP8xX/xZurn7TGpqPzbbHhHhpxRczUGZe4pkyncxFrRHNp9jbp0vHWxpA3rh Ojop+f6JQm0wHFRVdcc4hkw8zCrtGWQwC/HFYuLw4VGyZjqE6m8q9Ev6aOSRRVL8e7oe C9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6ivnv2sSbbM5Dowzqxd2Yjh8DW5uBXNhO01SKOygBxc=; b=Jhlf7WsKV/B/tHZa6Xx95zEXH4WiHQ2CH7uyVOwkpVqyrvhHl4exp8VeVWDXb/z2q+ 0LzoVtgsL4EROl5xRQ2D/6zsRlYJXM2np313S3kWnciNXTGFhgpFjNf0/SL5vzdWwt3O 3Q/wRni9Tg8f6iceNKoqH2QAL/uhGpMwb+6IA3b9NkqEu9oD/lV1XZB+7iVgxyo1q5Cx G0/gaB2u/Fp7FQ/LMd/xkkTQrBZqzaHp+mrRLFpCbrx+nqR065Gvlua6N7z8wPjLry5t x67qSTd+hAcSGyIRmRCe+TDpDRjaaKPKEptmW7liyrSNewPF1KDKylexGlgj6gP1NUre Gm8Q== X-Gm-Message-State: ALyK8tLfrmoAxeG8mte15jIfyl/5k0Bn+NdQhq0lpNiuP4cx2L1wwZuMinKyc5XoAp7ANA== X-Received: by 10.66.151.71 with SMTP id uo7mr18582818pab.134.1466382519129; Sun, 19 Jun 2016 17:28:39 -0700 (PDT) Received: from deepa-ubuntu.hsd1.ca.comcast.net (c-73-252-251-201.hsd1.ca.comcast.net. [73.252.251.201]) by smtp.gmail.com with ESMTPSA id s12sm34984980pfj.57.2016.06.19.17.28.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 17:28:38 -0700 (PDT) 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, Ilya Dryomov , Sage Weil , Alex Elder , ceph-devel@vger.kernel.org Subject: [PATCH v2 20/24] block: Replace CURRENT_TIME with ktime_get_real_ts Date: Sun, 19 Jun 2016 17:27:19 -0700 Message-Id: <1466382443-11063-21-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: Ilya Dryomov Cc: Sage Weil Cc: Alex Elder Cc: ceph-devel@vger.kernel.org --- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4506620..14867ab 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1888,7 +1888,7 @@ static void rbd_osd_req_format_write(struct rbd_obj_request *obj_request) { struct ceph_osd_request *osd_req = obj_request->osd_req; - osd_req->r_mtime = CURRENT_TIME; + ktime_get_real_ts(&osd_req->r_mtime); osd_req->r_data_offset = obj_request->offset; }