Skip to content

Commit cbe9e30

Browse files
author
Al Viro
committed
move_mount(2): switch to CLASS(filename_maybe_null)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 904f58b commit cbe9e30

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

fs/namespace.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4402,8 +4402,6 @@ SYSCALL_DEFINE5(move_mount,
44024402
{
44034403
struct path to_path __free(path_put) = {};
44044404
struct path from_path __free(path_put) = {};
4405-
struct filename *to_name __free(putname) = NULL;
4406-
struct filename *from_name __free(putname) = NULL;
44074405
unsigned int lflags, uflags;
44084406
enum mnt_tree_flags_t mflags = 0;
44094407
int ret = 0;
@@ -4425,7 +4423,7 @@ SYSCALL_DEFINE5(move_mount,
44254423
if (flags & MOVE_MOUNT_T_EMPTY_PATH)
44264424
uflags = AT_EMPTY_PATH;
44274425

4428-
to_name = getname_maybe_null(to_pathname, uflags);
4426+
CLASS(filename_maybe_null,to_name)(to_pathname, uflags);
44294427
if (!to_name && to_dfd >= 0) {
44304428
CLASS(fd_raw, f_to)(to_dfd);
44314429
if (fd_empty(f_to))
@@ -4448,7 +4446,7 @@ SYSCALL_DEFINE5(move_mount,
44484446
if (flags & MOVE_MOUNT_F_EMPTY_PATH)
44494447
uflags = AT_EMPTY_PATH;
44504448

4451-
from_name = getname_maybe_null(from_pathname, uflags);
4449+
CLASS(filename_maybe_null,from_name)(from_pathname, uflags);
44524450
if (!from_name && from_dfd >= 0) {
44534451
CLASS(fd_raw, f_from)(from_dfd);
44544452
if (fd_empty(f_from))

0 commit comments

Comments
 (0)