Unverified Commit d5a05a5a authored by Mateusz Guzik's avatar Mateusz Guzik Committed by Christian Brauner
Browse files

fs: tidy up do_sys_openat2() with likely/unlikely 



Otherwise gcc 13 generates conditional forward jumps (aka branch
mispredict by default) for build_open_flags() being succesfull.

Signed-off-by: default avatarMateusz Guzik <mjguzik@gmail.com>
Link: https://lore.kernel.org/r/20250320092331.1921700-1-mjguzik@gmail.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 9ae7e5a1

fs/open.c

+5 −4
Original line number Diff line number Diff line
@@ -1412,18 +1412,19 @@ static int do_sys_openat2(int dfd, const char __user *filename, 
			  struct open_how *how)

{

	struct open_flags op;

	int fd = build_open_flags(how, &op);

	struct filename *tmp;

	int err, fd;



	if (fd)

		return fd;

	err = build_open_flags(how, &op);

	if (unlikely(err))

		return err;



	tmp = getname(filename);

	if (IS_ERR(tmp))

		return PTR_ERR(tmp);



	fd = get_unused_fd_flags(how->flags);

	if (fd >= 0) {

	if (likely(fd >= 0)) {

		struct file *f = do_filp_open(dfd, tmp, &op);

		if (IS_ERR(f)) {

			put_unused_fd(fd);