From patchwork Wed Jul 11 09:14:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141700 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp48283ljj; Wed, 11 Jul 2018 02:15:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd+G5Jm/tYOo5SMOyF3rn/IoDb8P8MIZs0o2IxZyKFSeTTWhyeZf6aCc1e9QsGKhgcEs99W X-Received: by 2002:a63:920c:: with SMTP id o12-v6mr25874220pgd.233.1531300501521; Wed, 11 Jul 2018 02:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531300501; cv=none; d=google.com; s=arc-20160816; b=AKaykAPF6WQHG6SlFTC9uUlTK5PSRTgc/JfLnPkAZSFKmmqkFUFCt5nHCTeBTs/N6R uD/jFW8W7L9tfrBHth7xNK27W9Fgt1uhS//Q4VOIX3AJsfYcCLHKOhqx7SRm1VP4/FpK MGUkfXEEPNcJbteCzvEqMRMBztM+Z3g/ceBPmpjr5rEfbZQVN7VlP//JS80Voh7i/8Vz iTFXvMQKZgxtMCVeLsG0i3bkGK+hHIPV2dQVvkW61s+gdaCgsabYhCa5XkAnQ0Gv68yS XTSEgb7zBUnuygbadbikGDnhJ9mpap1fEKRIDgj+YybPCh274GAnXFy6Fg8hy0KFyANE CVNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=QaPj4Eh+FpcxMp6t6KzoBhl/hLuWPJgjYhXiJ7RO7cc=; b=bnJUyPl5bvjse5MwyUQoDxfsvzSWVoCNvZnjdPRfyJaq3NIjXaa/cG8JvBSX1Cnn4Y GgXGLA9n1XTMBJSQFEVMwrfHVdunWH1JXD2CcYoPvpENeivaXzq1HX47Y7vjV2wYzuwZ ylvQCBA4l0+815b/ukaGjHzjRM/t20bmJHALZaoJ6dxI3HGaIdoCI9akVBNgEAYxr2qY meFFze0nOpIJU39w104FtNGrbXQvoowtIf4kL97SX9v1nGPUzuryvOXEIzvi3MH81YmZ 3xyhzvfQdkczFLUhL3/xecHohW18D1N1zWXlBxCj7utlsmZ4pzUG0Dpgb48+cZMldm3S LbgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5-v6si3056094pgg.75.2018.07.11.02.15.01; Wed, 11 Jul 2018 02:15:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732566AbeGKJSS (ORCPT + 22 others); Wed, 11 Jul 2018 05:18:18 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:36257 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732496AbeGKJSQ (ORCPT ); Wed, 11 Jul 2018 05:18:16 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MI6MY-1fep6K2TB0-003s6C; Wed, 11 Jul 2018 11:14:50 +0200 From: Arnd Bergmann To: adilger.kernel@dilger.ca Cc: arnd@arndb.de, jack@suse.cz, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, sirmy15@gmail.com, stable@vger.kernel.org, tgnottingham@gmail.com, tytso@mit.edu, y2038@lists.linaro.org Subject: [PATCH v2 5/6] jbd2: replace current_kernel_time64 with ktime equivalent Date: Wed, 11 Jul 2018 11:14:13 +0200 Message-Id: <20180711091414.1494843-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180711091414.1494843-1-arnd@arndb.de> References: <20180711091414.1494843-1-arnd@arndb.de> X-Provags-ID: V03:K1:cVp0WYR2ZFIdEgbp9PF+Qdqd0SUXDYog7yfsgNUFUmd9mj8u2Cs aGL4HqKtEcPQgTMkfDdVWDNaD4AN2C9Ymm4GdkWPO+05GTFnwidcyCfW3cL3vP8JMO9A4wC cZgpBTsvRsolEphYT0vewKYZMOCzAXOp+ymz019x+Eb5h8cNXy48NcABJtAgyOA2efmRYu4 qmuQZU4q5Y/nqvJFhGaag== X-UI-Out-Filterresults: notjunk:1; V01:K0:d3MQqQdD6FA=:YokxPCv4m6sBog4Pxap2mi IcNPusw86p7AQW0af+5kMQeBMMbLFNvCWWbOjhoxWOQYcO0vl0I/UKc36+NeBvF7bQX75evS/ iUfPkB9HzlKooY8Ln6mENqcLcIhmgPcaxbL2Muuj80Y/ap5EMrcbOZ1weRnPkIXp4MtbGmT98 vBTlxgQlTfIZMbYM86s0YE92TTmrGANq/Ot7y3k0b8QmfGRzidu5wd2CcyL3WUU5sulqR0aaV tF5lyz4H30vRD5Ldf4+HAbZLPSlUAMchrda3kXsTgnhFND0W1KkhGcn0sMThZrDzRlyKQHLSo QO4tOqLq/SI1ENwwNbclLboGiJawK8ERW9uv7q3zo55d+ZFbR0S40aXspMV2nib3sryTxJivG NtLp97AyOLBgVbCSXe0kPuEMaRwGnQgs042wCAbCGls7JegV+M67hlPWEM5+Iz5BlW0NOAZBz WlOPH48mwCYBvaqfxOB0+XZKhfALtzAedh6RLzGY4AnBvav7bmi+Wt2SOMaqwg2gzf/EwoxZA GGbl63vopkyxCjXpFE+ttCp8yrx9Ee91lgWP0URGHRrPgWm1DrdG5lF66a28vU2K6p8ejz/p5 WufSe6JlWsMb6tQb/JTdOk+NCEt04fCfRWHHFl4WnoYLAcku+GWo3/AWdGZp+t/THS4hxiKTt CQpQmvrzrAkw8U0wh3iJPZaMQUDtBw0hUcjLS4eOle+5r5zduu/ZQKIrf0Wj/jmTzTAc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org jbd2 is one of the few callers of current_kernel_time64(), which is a wrapper around ktime_get_coarse_real_ts64(). This calls the latter directly for consistency with the rest of the kernel that is moving to the ktime_get_ family of time accessors. Reviewed-by: Andreas Dilger Reviewed-by: Jan Kara Signed-off-by: Arnd Bergmann --- fs/jbd2/commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8de0e7723316..150cc030b4d7 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -121,7 +121,7 @@ static int journal_submit_commit_record(journal_t *journal, struct commit_header *tmp; struct buffer_head *bh; int ret; - struct timespec64 now = current_kernel_time64(); + struct timespec64 now; *cbh = NULL; @@ -134,6 +134,7 @@ static int journal_submit_commit_record(journal_t *journal, return 1; tmp = (struct commit_header *)bh->b_data; + ktime_get_coarse_real_ts64(&now); tmp->h_commit_sec = cpu_to_be64(now.tv_sec); tmp->h_commit_nsec = cpu_to_be32(now.tv_nsec);