From: Jia He <justin.he@arm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jonathan Corbet <corbet@lwn.net>,
Luca Coelho <luciano.coelho@intel.com>,
Kalle Valo <kvalo@codeaurora.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Johannes Berg <johannes.berg@intel.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-s390@vger.kernel.org, Jia He <justin.he@arm.com>
Subject: [PATCH 2/4] lib/vsprintf.c: Make %p{D,d} mean as much components as possible
Date: Wed, 28 Apr 2021 21:59:27 +0800 [thread overview]
Message-ID: <20210428135929.27011-2-justin.he@arm.com> (raw)
In-Reply-To: <20210428135929.27011-1-justin.he@arm.com>
From: Linus Torvalds <torvalds@linux-foundation.org>
We have '%pD'(no digit following) for printing a filename. It may not be
perfect (by default it only prints one component.
%pD4 should be more than good enough, but we should make plain "%pD" mean
"as much of the path that is reasonable" rather than "as few components as
possible" (ie 1).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jia He <justin.he@arm.com>
---
Documentation/core-api/printk-formats.rst | 3 ++-
lib/vsprintf.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index 9be6de402cb9..aa76cbec0dae 100644
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -413,7 +413,8 @@ dentry names
For printing dentry name; if we race with :c:func:`d_move`, the name might
be a mix of old and new ones, but it won't oops. %pd dentry is a safer
equivalent of %s dentry->d_name.name we used to use, %pd<n> prints ``n``
-last components. %pD does the same thing for struct file.
+last components. %pD does the same thing for struct file. By default, %p{D,d}
+is equal to %p{D,d}4.
Passed by reference.
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6c56c62fd9a5..5b563953f970 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -880,11 +880,11 @@ char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_sp
int i, n;
switch (fmt[1]) {
- case '2': case '3': case '4':
+ case '1': case '2': case '3': case '4':
depth = fmt[1] - '0';
break;
default:
- depth = 1;
+ depth = 4;
}
rcu_read_lock();
--
2.17.1
next prev parent reply other threads:[~2021-04-28 13:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 13:59 [PATCH 1/4] iwlwifi: mvm: Explicitly use %pd1 in debugfs entry Jia He
2021-04-28 13:59 ` Jia He [this message]
2021-04-28 15:10 ` [PATCH 2/4] lib/vsprintf.c: Make %p{D,d} mean as much components as possible Andy Shevchenko
2021-04-29 8:46 ` Petr Mladek
2021-04-29 8:52 ` Andy Shevchenko
2021-04-29 9:24 ` Petr Mladek
2021-04-30 1:35 ` Justin He
2021-04-28 13:59 ` [PATCH 3/4] s390/hmcdrv: Remove the redundant directory path in debug message Jia He
2021-04-28 13:59 ` [PATCH 4/4] lib/test_printf: Explicitly add components number to %pD and %pd Jia He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210428135929.27011-2-justin.he@arm.com \
--to=justin.he@arm.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=borntraeger@de.ibm.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=johannes.berg@intel.com \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).