Commit cf4febc1 authored by Al Viro's avatar Al Viro
Browse files

d_path: prepend_path() is unlikely to return non-zero 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 008673ff

fs/d_path.c

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ char *__d_path(const struct path *path, 
	DECLARE_BUFFER(b, buf, buflen);



	prepend(&b, "", 1);

	if (prepend_path(path, root, &b) > 0)

	if (unlikely(prepend_path(path, root, &b) > 0))

		return NULL;

	return extract_string(&b);

}
@@ -199,7 +199,7 @@ char *d_absolute_path(const struct path *path, 
	DECLARE_BUFFER(b, buf, buflen);



	prepend(&b, "", 1);

	if (prepend_path(path, &root, &b) > 1)

	if (unlikely(prepend_path(path, &root, &b) > 1))

		return ERR_PTR(-EINVAL);

	return extract_string(&b);

}
@@ -396,7 +396,7 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size) 
		DECLARE_BUFFER(b, page, PATH_MAX);



		prepend(&b, "", 1);

		if (prepend_path(&pwd, &root, &b) > 0)

		if (unlikely(prepend_path(&pwd, &root, &b) > 0))

			prepend(&b, "(unreachable)", 13);

		rcu_read_unlock();