Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp332306lqa; Sat, 27 Apr 2024 04:30:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXP2hkwyYmnkHGLukWNsF50W4rZLAWyLg0sAXt0QlxxnZYFDDhnNUv6pR0BkO/PQijvKMqdos3aZbnur1XclYpIA8S9C8Nuy/LLC+tdrQ== X-Google-Smtp-Source: AGHT+IHIfwxhB+h5KOvN7VWHVRSOWncGsGFa+MdKQybJXpbNpZ4zCenkJwp3BBfT/k9IJdanUJY2 X-Received: by 2002:a17:902:da8f:b0:1e4:b16e:7f10 with SMTP id j15-20020a170902da8f00b001e4b16e7f10mr6733374plx.33.1714217452482; Sat, 27 Apr 2024 04:30:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714217452; cv=pass; d=google.com; s=arc-20160816; b=J01MTOLka0T8nY26le1jkeWoOmC/HkNrp1kg/yu++oBCKTQt5N5CY53I7In2HyMVKb n7wUryKOeEviYnoHsaVZvh62eE1mLhfhoOdBXOS+BNfOJZg75V+L/baZdBjjqkKXqvQ3 +7uU0vlRWX9LcOvB/xs5HZxjStsE36CemORUYE5IGrzzO7mTOp0vWHDBOlmAvumWrB9v aQMJ0dPXaBNxejvqeq9q+i+0URFJKtqcS88CjX9W/1hQCSUxDAP4EBGlZx/PvKR0s+Sm um8PWT1VsCfDpkVMj2Oj3sg/6qlzQnXhEo+NJEIoKSxSfAnk9De7M1uGnn8KSUtqf5mC 4hdg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=N6Wa5ZdYH+jnqmFV3t56OpNcrMxvOQwAgYBdbDZuPl8=; fh=328TqmIIEN4VgTC/+/XdKCFZhWn0fxfd+KKmu/Qf5iY=; b=G+gvvncbfhUCJg46OmO23OgEXv8CCKRTEQV/nqwhM7QgnEJcfzML9Kt0hd52DlpQNE F2dV9FV3GKb51hEuTE3QbCsZJAOtweOB7KFPNok+ONrGvJ7lpHfaVj4qWg7LsM9+/PRD 4pK1Y23nvuiG74J55zCobI/zIkc/3pQukvgPDoUm6rPAEr9MMgXUHzGq4IPPE54warnN on89pmzLM95e2L84pLuGOevd2sURDRbguwowoSlekXzar/uybdbg9VfpNPdzYSsoScqQ 8ugplBrLTEHZ3Gw0FBAJvJXy/ksflj5jA/0k3CQaZe9je1VaXyb/+Yju+oOpp4+i5g0p 1K4A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=qzFP3BHf; arc=pass (i=1 spf=pass spfdomain=yandex.ru dkim=pass dkdomain=yandex.ru dmarc=pass fromdomain=yandex.ru); spf=pass (google.com: domain of linux-kernel+bounces-161033-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161033-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id j12-20020a170902f24c00b001e3e49e8a3csi15711675plc.154.2024.04.27.04.30.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Apr 2024 04:30:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-161033-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=qzFP3BHf; arc=pass (i=1 spf=pass spfdomain=yandex.ru dkim=pass dkdomain=yandex.ru dmarc=pass fromdomain=yandex.ru); spf=pass (google.com: domain of linux-kernel+bounces-161033-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161033-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C85992857EF for ; Sat, 27 Apr 2024 11:25:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3AD954C627; Sat, 27 Apr 2024 11:25:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yandex.ru header.i=@yandex.ru header.b="qzFP3BHf" Received: from forward103a.mail.yandex.net (forward103a.mail.yandex.net [178.154.239.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23A164AECA; Sat, 27 Apr 2024 11:25:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.154.239.86 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714217106; cv=none; b=ht6wSNmlFCeNnqSO3eju99ULcdTyEGUtTcMf9lDnIeaRGAUER9z2UePAugL305HniigkoX6oE8SsUWS0iMQ25QqmdGp6ncKqkmBHlIjmeN7rdCrPxykeRjGl9qqQ6dRdjT8uMk51r0D6cbvPwxYF+dvltOcrs4l8RjRxoMMo1dU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714217106; c=relaxed/simple; bh=eW+R7T+4wDE0CCmXnPO5w8nUsJ7ogtYZtHHlx4MY378=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPNcCG/PIjRnSFJ4GwUb4EblSfr1lAx1y2ZrYZCjdWg8dSOzC490BxcqCQX3HQEelKNbGFfFitOJKUYKbXhKrQjhwwJHcq3mH8mMm7rD688tZDrZjTowE5nBU9EfnUJtRgKvSAO/GiMoAQ4kj9BWHwSpwv4roYTJic38kziyizI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=yandex.ru; spf=pass smtp.mailfrom=yandex.ru; dkim=pass (1024-bit key) header.d=yandex.ru header.i=@yandex.ru header.b=qzFP3BHf; arc=none smtp.client-ip=178.154.239.86 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=yandex.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yandex.ru Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c0d:2a02:0:640:77d9:0]) by forward103a.mail.yandex.net (Yandex) with ESMTPS id C6FAE60030; Sat, 27 Apr 2024 14:24:59 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id uOMFvPQXlqM0-vUxBD1Hs; Sat, 27 Apr 2024 14:24:58 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1714217098; bh=N6Wa5ZdYH+jnqmFV3t56OpNcrMxvOQwAgYBdbDZuPl8=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=qzFP3BHfeY7rNGhZqBxXwE4wxJOr2GnR07ho6nERxZiLgP3hs34KsBaZUdFQUWueA ybOo2p7OvRCqzugDoddGG6scVZTISVNsvZRwRuPHoKZDu9BsTWeK75cjmp3Ngl2Nj0 Z1DNCq4MaKmj2OiVF3aYmInGHMWD8uK+kuKN9Lus= Authentication-Results: mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: linux-kernel@vger.kernel.org Cc: Stas Sergeev , Stefan Metzmacher , Eric Biederman , Alexander Viro , Andy Lutomirski , Christian Brauner , Jan Kara , Jeff Layton , Chuck Lever , Alexander Aring , David Laight , linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Paolo Bonzini , =?UTF-8?q?Christian=20G=C3=B6ttsche?= Subject: [PATCH v6 1/3] fs: reorganize path_openat() Date: Sat, 27 Apr 2024 14:24:49 +0300 Message-ID: <20240427112451.1609471-2-stsp2@yandex.ru> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240427112451.1609471-1-stsp2@yandex.ru> References: <20240427112451.1609471-1-stsp2@yandex.ru> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This patch moves the call to alloc_empty_file() down the if branches. That changes is needed for the next patch, which adds a cred override for alloc_empty_file(). The cred override is only needed in one branch, i.e. it is not needed for O_PATH and O_TMPFILE.. No functional changes are intended by that patch. Signed-off-by: Stas Sergeev CC: Eric Biederman CC: Alexander Viro CC: Christian Brauner CC: Jan Kara CC: Andy Lutomirski CC: David Laight CC: linux-fsdevel@vger.kernel.org CC: linux-kernel@vger.kernel.org --- fs/namei.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c5b2a25be7d0..dd50345f7260 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3781,17 +3781,24 @@ static struct file *path_openat(struct nameidata *nd, { struct file *file; int error; + int open_flags = op->open_flag; - file = alloc_empty_file(op->open_flag, current_cred()); - if (IS_ERR(file)) - return file; - - if (unlikely(file->f_flags & __O_TMPFILE)) { - error = do_tmpfile(nd, flags, op, file); - } else if (unlikely(file->f_flags & O_PATH)) { - error = do_o_path(nd, flags, file); + if (unlikely(open_flags & (__O_TMPFILE | O_PATH))) { + file = alloc_empty_file(open_flags, current_cred()); + if (IS_ERR(file)) + return file; + if (open_flags & __O_TMPFILE) + error = do_tmpfile(nd, flags, op, file); + else + error = do_o_path(nd, flags, file); } else { - const char *s = path_init(nd, flags); + const char *s; + + file = alloc_empty_file(open_flags, current_cred()); + if (IS_ERR(file)) + return file; + + s = path_init(nd, flags); while (!(error = link_path_walk(s, nd)) && (s = open_last_lookups(nd, file, op)) != NULL) ; -- 2.44.0