linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC][PATCH 07/27] lift fput() on late failures into path_openat()
Date: Mon,  9 Jul 2018 05:53:57 +0100	[thread overview]
Message-ID: <20180709045417.13988-7-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20180709045417.13988-1-viro@ZenIV.linux.org.uk>

From: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/namei.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index a58e00076ba1..36c2fa804e26 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3409,8 +3409,6 @@ static int do_last(struct nameidata *nd,
 	if (!error && will_truncate)
 		error = handle_truncate(file);
 out:
-	if (unlikely(error) && (*opened & FILE_OPENED))
-		fput(file);
 	if (unlikely(error > 0)) {
 		WARN_ON(1);
 		error = -EINVAL;
@@ -3488,8 +3486,6 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
 	if (file->f_mode & FMODE_OPENED)
 		*opened |= FILE_OPENED;
 	error = open_check_o_direct(file);
-	if (error)
-		fput(file);
 out2:
 	mnt_drop_write(path.mnt);
 out:
@@ -3551,20 +3547,23 @@ static struct file *path_openat(struct nameidata *nd,
 	}
 	terminate_walk(nd);
 out2:
-	if (!(opened & FILE_OPENED)) {
-		BUG_ON(!error);
-		put_filp(file);
+	if (likely(!error)) {
+		if (likely(opened & FILE_OPENED))
+			return file;
+		WARN_ON(1);
+		error = -EINVAL;
 	}
-	if (unlikely(error)) {
-		if (error == -EOPENSTALE) {
-			if (flags & LOOKUP_RCU)
-				error = -ECHILD;
-			else
-				error = -ESTALE;
-		}
-		file = ERR_PTR(error);
+	if (opened & FILE_OPENED)
+		fput(file);
+	else
+		put_filp(file);
+	if (error == -EOPENSTALE) {
+		if (flags & LOOKUP_RCU)
+			error = -ECHILD;
+		else
+			error = -ESTALE;
 	}
-	return file;
+	return ERR_PTR(error);
 }
 
 struct file *do_filp_open(int dfd, struct filename *pathname,
-- 
2.11.0

  parent reply	other threads:[~2018-07-09  4:54 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-09  4:53 [RFC][PATCHES] open()-related cleanups Al Viro
2018-07-09  4:53 ` [RFC][PATCH 01/27] drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open() Al Viro
2018-07-09  4:53   ` [RFC][PATCH 02/27] cxl_getfile(): fix double-iput() on alloc_file() failures Al Viro
2018-07-09  4:53   ` [RFC][PATCH 03/27] ocxlflash_getfile(): " Al Viro
2018-07-09  4:53   ` [RFC][PATCH 04/27] make sure do_dentry_open() won't return positive as an error Al Viro
2018-07-09  4:53   ` [RFC][PATCH 05/27] introduce FMODE_OPENED Al Viro
2018-07-09  4:53   ` [RFC][PATCH 06/27] get rid of 'opened' argument of finish_open() Al Viro
2018-07-09  4:53   ` Al Viro [this message]
2018-07-09  4:53   ` [RFC][PATCH 08/27] switch all remaining checks for FILE_OPENED to FMODE_OPENED Al Viro
2018-07-09  4:53   ` [RFC][PATCH 09/27] now we can fold open_check_o_direct() into do_dentry_open() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 10/27] introduce FMODE_CREATED and switch to it Al Viro
2018-07-09  4:54   ` [RFC][PATCH 11/27] IMA: don't propagate opened through the entire thing Al Viro
2018-07-09  4:54   ` [RFC][PATCH 12/27] Preparation to killing ->atomic_open() 'opened' argument Al Viro
2018-07-09  4:54   ` [RFC][PATCH 13/27] get rid of 'opened' argument of ->atomic_open() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 14/27] get rid of 'opened' in path_openat() and the helpers downstream Al Viro
2018-07-09  4:54   ` [RFC][PATCH 15/27] kill FILE_{CREATED,OPENED} Al Viro
2018-07-09  4:54   ` [RFC][PATCH 16/27] new wrapper: alloc_file_pseudo() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 17/27] __shmem_file_setup(): reorder allocations Al Viro
2018-07-09  4:54   ` [RFC][PATCH 18/27] ... and switch shmem_file_setup() to alloc_file_pseudo() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 19/27] cxl_getfile(): switch " Al Viro
2018-07-09  4:54   ` [RFC][PATCH 20/27] ocxlflash_getfile(): " Al Viro
2018-07-09  4:54   ` [RFC][PATCH 21/27] hugetlb_file_setup(): " Al Viro
2018-07-09  4:54   ` [RFC][PATCH 22/27] anon_inode_getfile(): " Al Viro
2018-07-09  4:54   ` [RFC][PATCH 23/27] create_pipe_files(): switch the first allocation " Al Viro
2018-07-09  4:54   ` [RFC][PATCH 24/27] new helper: alloc_file_clone() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 25/27] do_shmat(): grab shp->shm_file earlier, switch to alloc_file_clone() Al Viro
2018-07-09  4:54   ` [RFC][PATCH 26/27] make alloc_file() static Al Viro
2018-07-09  4:54   ` [RFC][PATCH 27/27] turn filp_clone_open() into inline wrapper for dentry_open() Al Viro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180709045417.13988-7-viro@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).