From patchwork Sat Jun 25 21:37:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9198727 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 855E56077D for ; Sat, 25 Jun 2016 21:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D74B2852B for ; Sat, 25 Jun 2016 21:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7055A2852E; Sat, 25 Jun 2016 21:39:16 +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 1D58528527 for ; Sat, 25 Jun 2016 21:39:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbcFYVix (ORCPT ); Sat, 25 Jun 2016 17:38:53 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:35930 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752061AbcFYViu (ORCPT ); Sat, 25 Jun 2016 17:38:50 -0400 Received: by mail-pa0-f68.google.com with SMTP id av7so5854810pac.3; Sat, 25 Jun 2016 14:38:50 -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=nFG/KpPtmljzr0mURuRVcg7RSEeCXR/9gCoZvTkmjQFuVlgb7FP63ELkzgoncI2FVP fqx67fOE9P8ix5o6w7bbTKVOGjUma1S0qCnWI4RS6M6ahCiKh+sJZepQfka+6JwvGovy aWYNxgZwceWxKJXgJfwSu3Yl9lfea6jLIlHBqH/UXwX8xMbRyt/lTPA3blJPzj1TMZtG 1faHhifOfysAL+qivUL4ZoxduY1un111j3hUXkL+mb0EX60X6kGZiuW1qUaquufItSrt PqMoNa3ZzUq9ccAU2M2kznqCKn4OYqTZ17qzdAqbRVZ9nLH8BxUXbzVXKuGX6XiHulEm eYgQ== 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=SOfvKBrqHcuTi/pVqZlJjhKruruJuYGZhOYYbvu7SRezGteDtcCloHujuAV+zakzp/ GmPRNSYxQnP7o8icG3EZJQ2qA8Amita1JOlMCZGALrG3xOC3SSnKAREOaeNsxdZBjC59 HtohjGDiE8E77qFoMC/3R6EAgN40ggLDdNTwkW1VEpr9VMJn1aZHhbwa1GgUU/wHVCgl 5QK2vL8JF9VPKCOhf3VOoPEyUwQY0lLZELKnxvnArRoo87JC9f9dfs/xumCUW8c+eN4k e236JyjeXS6j7BCJZoaLS3STJg7WfYnIzBEyOubwg4vm3OgVei3wBAobbriU4DNwR9/E 7Akw== X-Gm-Message-State: ALyK8tJDj5jvHPcEr8JeuHlEZlGx9jxv/vZiWefMsvAhtkIMitGb7F9rOodieF6azYe0jQ== X-Received: by 10.66.248.65 with SMTP id yk1mr19973209pac.56.1466890724615; Sat, 25 Jun 2016 14:38:44 -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 m8sm1861308pfi.27.2016.06.25.14.38.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jun 2016 14:38:44 -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 v3 20/24] block: Replace CURRENT_TIME with ktime_get_real_ts Date: Sat, 25 Jun 2016 14:37:44 -0700 Message-Id: <1466890668-23400-21-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466890668-23400-1-git-send-email-deepa.kernel@gmail.com> References: <1466890668-23400-1-git-send-email-deepa.kernel@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@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; }