From patchwork Sat Aug 13 22:48:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9278747 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 938E060839 for ; Sun, 14 Aug 2016 10:39:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 833ED28A06 for ; Sun, 14 Aug 2016 10:39:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 751B328A1A; Sun, 14 Aug 2016 10:39:51 +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 D2D3A28A06 for ; Sun, 14 Aug 2016 10:39:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752315AbcHNKi6 (ORCPT ); Sun, 14 Aug 2016 06:38:58 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35946 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751290AbcHNKi5 (ORCPT ); Sun, 14 Aug 2016 06:38:57 -0400 Received: by mail-pa0-f66.google.com with SMTP id ez1so2031315pab.3; Sun, 14 Aug 2016 03:38:57 -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=mhPY+Xb+tJqDnS7Y5hIyDsRzjCokN/SqPnTNr4ZhmJ4=; b=szWaWudyQIwvwzz+FYTIebtd24Sm5Yxm+tXTlOk+acxqYZyrbOyHOkU6GoH0Xnx0bc M9NpI9g5RJXy9NRU2/8Qz8SCZ6lqbqiheAH8q2ZlPB+D4VedJKWlzB1KDfbddlLJweql 3727Mx2v9zWvFoctVVDidYhgGgTHOziqO7KHC7InbAQCS2x9i9iDadPLu2XPYypTJwzO GnsVSYd3QapouUSRX0Fp7zZs1GYE7+W2CyXSIN5dSjM6q+opxuUSjUC0kjGFJ5b/YBH5 dLvwfqOg/TGPoOLz0qRhbwXJEzhZq1+cE2NQrek2Ra52DUWkI1+0jwBuu6fsWwu1sqZW 6qEQ== 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=mhPY+Xb+tJqDnS7Y5hIyDsRzjCokN/SqPnTNr4ZhmJ4=; b=hUPgSVua9PMHOSJeYBfIIe7UEzduha2O9LpbKJQFu+It7FusqPP2+RMje9k7M1+5Od GZp9QGCLOIZmotVINtk3KD3zJ7EfiiwwAMwn2bmnaDKoS3zCFHhpx0yNCOrxDscDdzk+ cFLnuskliwWv6Bys9h2uJjvzYB5DLSKLH5TZMUkxC7z7TF4bQyYlkPGor0De6wkymYP+ 8MuPGDzmqmA/2yEm0QNF3GMtdHQHGFNyh9VpdrACeGA61PAS5Xb9jNWjBTEvvs1PJx9s I0mrrTu94kLntCsYb93AYI2gbFzdycnju03lkGv4PvDCVS7uCwjEdTtnlRMYNiINpAmc jdWA== X-Gm-Message-State: AEkoouu6gtwn+CU7OfxsYIyK/gyZr7SwGrLeWSERwp5PqB0wosdoRP++M8maoFCE43CHJQ== X-Received: by 10.66.43.7 with SMTP id s7mr40534538pal.27.1471128579972; Sat, 13 Aug 2016 15:49: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 81sm22528007pfm.90.2016.08.13.15.49.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Aug 2016 15:49:39 -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 v4 21/26] block: Replace CURRENT_TIME with ktime_get_real_ts Date: Sat, 13 Aug 2016 15:48:33 -0700 Message-Id: <1471128518-24075-22-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-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 Reviewed-by: Arnd Bergmann 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 6c6519f..e5b120e 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; }