From dfe5087675e66f3cce8d98447bf01602f3cdea24 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 17 May 2021 21:11:45 -0400
Subject: [PATCH] d_path: "\0" is {0,0}, not {0}
Single-element array consisting of one NUL is spelled ""...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/d_path.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/d_path.c b/fs/d_path.c
index 270d62133996b..01df5dfa1f88a 100644
--- a/fs/d_path.c
+++ b/fs/d_path.c
@@ -184,7 +184,7 @@ char *__d_path(const struct path *path,
char *res = buf + buflen;
int error;
- prepend(&res, &buflen, "\0", 1);
+ prepend(&res, &buflen, "", 1);
error = prepend_path(path, root, &res, &buflen);
if (error < 0)
@@ -201,7 +201,7 @@ char *d_absolute_path(const struct path *path,
char *res = buf + buflen;
int error;
- prepend(&res, &buflen, "\0", 1);
+ prepend(&res, &buflen, "", 1);
error = prepend_path(path, &root, &res, &buflen);
if (error > 1)
@@ -218,7 +218,7 @@ static int path_with_deleted(const struct path *path,
const struct path *root,
char **buf, int *buflen)
{
- prepend(buf, buflen, "\0", 1);
+ prepend(buf, buflen, "", 1);
if (d_unlinked(path->dentry)) {
int error = prepend(buf, buflen, " (deleted)", 10);
if (error)
@@ -341,7 +341,7 @@ static char *__dentry_path(const struct dentry *d, char *buf, int buflen)
dentry = d;
end = buf + buflen;
len = buflen;
- prepend(&end, &len, "\0", 1);
+ prepend(&end, &len, "", 1);
/* Get '/' right */
retval = end-1;
*retval = '/';
@@ -444,7 +444,7 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
char *cwd = page + PATH_MAX;
int buflen = PATH_MAX;
- prepend(&cwd, &buflen, "\0", 1);
+ prepend(&cwd, &buflen, "", 1);
error = prepend_path(&pwd, &root, &cwd, &buflen);
rcu_read_unlock();
--
GitLab