After the behavior of '%pD' is changed to print the full path of file,
the previous number postfix of '%pD' is pointless.
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Jia He <justin.he@xxxxxxx>
---
fs/exec.c | 2 +-
fs/ioctl.c | 2 +-
fs/read_write.c | 2 +-
fs/splice.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index 38f63451b928..a9f9de7da8ff 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -811,7 +811,7 @@ int setup_arg_pages(struct linux_binprm *bprm,
BUG_ON(prev != vma);
if (unlikely(vm_flags & VM_EXEC)) {
- pr_warn_once("process '%pD4' started with executable stack\n",
+ pr_warn_once("process '%pD' started with executable stack\n",
bprm->file);
}
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1e2204fa9963..80c9d3d00c8f 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -78,7 +78,7 @@ static int ioctl_fibmap(struct file *filp, int __user *p)
if (block > INT_MAX) {
error = -ERANGE;
- pr_warn_ratelimited("[%s/%d] FS: %s File: %pD4 would truncate fibmap result\n",
+ pr_warn_ratelimited("[%s/%d] FS: %s File: %pD would truncate fibmap result\n",
current->comm, task_pid_nr(current),
sb->s_id, filp);
}
diff --git a/fs/read_write.c b/fs/read_write.c
index 9db7adf160d2..3fdb17e4b712 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -422,7 +422,7 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo
static int warn_unsupported(struct file *file, const char *op)
{
pr_warn_ratelimited(
- "kernel %s not supported for file %pD4 (pid: %d comm: %.20s)\n",
+ "kernel %s not supported for file %pD (pid: %d comm: %.20s)\n",
op, file, current->pid, current->comm);
return -EINVAL;
}
diff --git a/fs/splice.c b/fs/splice.c
index 5dbce4dcc1a7..4b0b9029b5ca 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -751,7 +751,7 @@ EXPORT_SYMBOL(generic_splice_sendpage);
static int warn_unsupported(struct file *file, const char *op)
{
pr_debug_ratelimited(
- "splice %s not supported for file %pD4 (pid: %d comm: %.20s)\n",
+ "splice %s not supported for file %pD (pid: %d comm: %.20s)\n",
op, file, current->pid, current->comm);
return -EINVAL;
}
--
2.17.1
