From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7053AC47E48 for ; Thu, 15 Jul 2021 03:16:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AD7661396 for ; Thu, 15 Jul 2021 03:16:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234069AbhGODTW (ORCPT ); Wed, 14 Jul 2021 23:19:22 -0400 Received: from foss.arm.com ([217.140.110.172]:46038 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234349AbhGODTS (ORCPT ); Wed, 14 Jul 2021 23:19:18 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4418B11FB; Wed, 14 Jul 2021 20:16:25 -0700 (PDT) Received: from entos-ampere-02.shanghai.arm.com (entos-ampere-02.shanghai.arm.com [10.169.214.103]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E4B873F7D8; Wed, 14 Jul 2021 20:16:22 -0700 (PDT) From: Jia He To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Christoph Hellwig , nd@arm.com, Jia He , Andrew Morton , linux-mm@kvack.org Subject: [PATCH RFC 09/13] mm/filemap: simplify the printing with '%pD' specifier Date: Thu, 15 Jul 2021 11:15:29 +0800 Message-Id: <20210715031533.9553-10-justin.he@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210715031533.9553-1-justin.he@arm.com> References: <20210715031533.9553-1-justin.he@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After the behavior of '%pD' is changed to print the full path of file, the log printing in dio_warn_stale_pagecache() can be simplified. Given that the error case is well handled in d_path_unsafe(), the error string would be copied in '%pD' buffer, no need to additionally handle IS_ERR(). Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jia He --- mm/filemap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index d1458ecf2f51..477288017765 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3497,16 +3497,11 @@ EXPORT_SYMBOL(pagecache_write_end); void dio_warn_stale_pagecache(struct file *filp) { static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); - char pathname[128]; - char *path; errseq_set(&filp->f_mapping->wb_err, -EIO); if (__ratelimit(&_rs)) { - path = file_path(filp, pathname, sizeof(pathname)); - if (IS_ERR(path)) - path = "(unknown)"; pr_crit("Page cache invalidation failure on direct I/O. Possible data corruption due to collision with buffered I/O!\n"); - pr_crit("File: %s PID: %d Comm: %.20s\n", path, current->pid, + pr_crit("File: %pD PID: %d Comm: %.20s\n", filp, current->pid, current->comm); } } -- 2.17.1