All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Michael Ellerman <mpe@ellerman.id.au>,
	x86@kernel.org
Cc: Alexey Dobriyan <adobriyan@gmail.com>,
	Luis Chamberlain <mcgrof@kernel.org>,
	Kees Cook <keescook@chromium.org>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 01/14] proc: remove a level of indentation in proc_get_inode
Date: Thu,  3 Sep 2020 16:22:29 +0200	[thread overview]
Message-ID: <20200903142242.925828-2-hch@lst.de> (raw)
In-Reply-To: <20200903142242.925828-1-hch@lst.de>

Just return early on inode allocation failure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/proc/inode.c | 72 +++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 28d6105e908e4c..016b1302cbabc0 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -619,42 +619,44 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 {
 	struct inode *inode = new_inode(sb);
 
-	if (inode) {
-		inode->i_ino = de->low_ino;
-		inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-		PROC_I(inode)->pde = de;
-
-		if (is_empty_pde(de)) {
-			make_empty_dir_inode(inode);
-			return inode;
-		}
-		if (de->mode) {
-			inode->i_mode = de->mode;
-			inode->i_uid = de->uid;
-			inode->i_gid = de->gid;
-		}
-		if (de->size)
-			inode->i_size = de->size;
-		if (de->nlink)
-			set_nlink(inode, de->nlink);
-
-		if (S_ISREG(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = &proc_reg_file_ops;
+	if (!inode) {
+		pde_put(de);
+		return NULL;
+	}
+
+	inode->i_ino = de->low_ino;
+	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+	PROC_I(inode)->pde = de;
+	if (is_empty_pde(de)) {
+		make_empty_dir_inode(inode);
+		return inode;
+	}
+
+	if (de->mode) {
+		inode->i_mode = de->mode;
+		inode->i_uid = de->uid;
+		inode->i_gid = de->gid;
+	}
+	if (de->size)
+		inode->i_size = de->size;
+	if (de->nlink)
+		set_nlink(inode, de->nlink);
+
+	if (S_ISREG(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = &proc_reg_file_ops;
 #ifdef CONFIG_COMPAT
-			if (!de->proc_ops->proc_compat_ioctl) {
-				inode->i_fop = &proc_reg_file_ops_no_compat;
-			}
+		if (!de->proc_ops->proc_compat_ioctl)
+			inode->i_fop = &proc_reg_file_ops_no_compat;
 #endif
-		} else if (S_ISDIR(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = de->proc_dir_ops;
-		} else if (S_ISLNK(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = NULL;
-		} else
-			BUG();
-	} else
-	       pde_put(de);
+	} else if (S_ISDIR(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = de->proc_dir_ops;
+	} else if (S_ISLNK(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = NULL;
+	} else {
+		BUG();
+	}
 	return inode;
 }
-- 
2.28.0


WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Michael Ellerman <mpe@ellerman.id.au>,
	x86@kernel.org
Cc: linux-arch@vger.kernel.org, Kees Cook <keescook@chromium.org>,
	linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>,
	linux-fsdevel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	Alexey Dobriyan <adobriyan@gmail.com>
Subject: [PATCH 01/14] proc: remove a level of indentation in proc_get_inode
Date: Thu,  3 Sep 2020 16:22:29 +0200	[thread overview]
Message-ID: <20200903142242.925828-2-hch@lst.de> (raw)
In-Reply-To: <20200903142242.925828-1-hch@lst.de>

Just return early on inode allocation failure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/proc/inode.c | 72 +++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 28d6105e908e4c..016b1302cbabc0 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -619,42 +619,44 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 {
 	struct inode *inode = new_inode(sb);
 
-	if (inode) {
-		inode->i_ino = de->low_ino;
-		inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-		PROC_I(inode)->pde = de;
-
-		if (is_empty_pde(de)) {
-			make_empty_dir_inode(inode);
-			return inode;
-		}
-		if (de->mode) {
-			inode->i_mode = de->mode;
-			inode->i_uid = de->uid;
-			inode->i_gid = de->gid;
-		}
-		if (de->size)
-			inode->i_size = de->size;
-		if (de->nlink)
-			set_nlink(inode, de->nlink);
-
-		if (S_ISREG(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = &proc_reg_file_ops;
+	if (!inode) {
+		pde_put(de);
+		return NULL;
+	}
+
+	inode->i_ino = de->low_ino;
+	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+	PROC_I(inode)->pde = de;
+	if (is_empty_pde(de)) {
+		make_empty_dir_inode(inode);
+		return inode;
+	}
+
+	if (de->mode) {
+		inode->i_mode = de->mode;
+		inode->i_uid = de->uid;
+		inode->i_gid = de->gid;
+	}
+	if (de->size)
+		inode->i_size = de->size;
+	if (de->nlink)
+		set_nlink(inode, de->nlink);
+
+	if (S_ISREG(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = &proc_reg_file_ops;
 #ifdef CONFIG_COMPAT
-			if (!de->proc_ops->proc_compat_ioctl) {
-				inode->i_fop = &proc_reg_file_ops_no_compat;
-			}
+		if (!de->proc_ops->proc_compat_ioctl)
+			inode->i_fop = &proc_reg_file_ops_no_compat;
 #endif
-		} else if (S_ISDIR(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = de->proc_dir_ops;
-		} else if (S_ISLNK(inode->i_mode)) {
-			inode->i_op = de->proc_iops;
-			inode->i_fop = NULL;
-		} else
-			BUG();
-	} else
-	       pde_put(de);
+	} else if (S_ISDIR(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = de->proc_dir_ops;
+	} else if (S_ISLNK(inode->i_mode)) {
+		inode->i_op = de->proc_iops;
+		inode->i_fop = NULL;
+	} else {
+		BUG();
+	}
 	return inode;
 }
-- 
2.28.0


  reply	other threads:[~2020-09-03 14:48 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-03 14:22 remove the last set_fs() in common code, and remove it for x86 and powerpc v3 Christoph Hellwig
2020-09-03 14:22 ` Christoph Hellwig
2020-09-03 14:22 ` Christoph Hellwig [this message]
2020-09-03 14:22   ` [PATCH 01/14] proc: remove a level of indentation in proc_get_inode Christoph Hellwig
2020-09-03 14:22 ` [PATCH 02/14] proc: cleanup the compat vs no compat file ops Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 03/14] proc: add a read_iter method to proc proc_ops Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 04/14] sysctl: Convert to iter interfaces Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 05/14] fs: don't allow kernel reads and writes without iter ops Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-10-01 22:38   ` Eric Biggers
2020-10-01 22:38     ` Eric Biggers
2020-10-01 22:40     ` Al Viro
2020-10-01 22:40       ` Al Viro
2020-10-02 16:27       ` Linus Torvalds
2020-10-02 16:27         ` Linus Torvalds
2020-10-09 22:06         ` Eric Biggers
2020-10-09 22:06           ` Eric Biggers
2020-10-10  1:03           ` Linus Torvalds
2020-10-10  1:03             ` Linus Torvalds
2020-10-10  1:19             ` Eric Biggers
2020-10-10  1:19               ` Eric Biggers
2020-10-10  1:29               ` Linus Torvalds
2020-10-10  1:29                 ` Linus Torvalds
2020-10-10  1:55                 ` Alexander Viro
2020-10-10  1:55                   ` Alexander Viro
2020-10-14  5:51                   ` Christoph Hellwig
2020-10-14  5:51                     ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 06/14] fs: don't allow splice read/write without explicit ops Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 07/14] uaccess: add infrastructure for kernel builds with set_fs() Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 08/14] test_bitmap: remove user bitmap tests Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 09/14] lkdtm: remove set_fs-based tests Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 10/14] x86: move PAGE_OFFSET, TASK_SIZE & friends to page_{32,64}_types.h Christoph Hellwig
2020-09-03 14:22   ` [PATCH 10/14] x86: move PAGE_OFFSET, TASK_SIZE & friends to page_{32, 64}_types.h Christoph Hellwig
2020-09-03 14:22 ` [PATCH 11/14] x86: make TASK_SIZE_MAX usable from assembly code Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 12/14] x86: remove address space overrides using set_fs() Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 21:30   ` David Laight
2020-09-03 21:30     ` David Laight
2020-09-03 23:25     ` Linus Torvalds
2020-09-03 23:25       ` Linus Torvalds
2020-09-04  7:59       ` David Laight
2020-09-04  7:59         ` David Laight
2020-09-04  2:55   ` Al Viro
2020-09-04  2:55     ` Al Viro
2020-09-04  4:41     ` Al Viro
2020-09-04  4:41       ` Al Viro
2020-09-04  6:38     ` Christoph Hellwig
2020-09-04  6:38       ` Christoph Hellwig
2020-09-04  7:47       ` Christoph Hellwig
2020-09-04  7:47         ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 13/14] powerpc: use non-set_fs based maccess routines Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 14:22 ` [PATCH 14/14] powerpc: remove address space overrides using set_fs() Christoph Hellwig
2020-09-03 14:22   ` Christoph Hellwig
2020-09-03 15:43   ` Christophe Leroy
2020-09-03 15:49     ` Christoph Hellwig
2020-09-03 15:49       ` Christoph Hellwig
2020-09-03 15:56       ` Christoph Hellwig
2020-09-03 15:56         ` Christoph Hellwig
2020-09-03 16:03         ` Christophe Leroy
2020-09-03 16:03           ` Christophe Leroy
2020-09-03 14:28 ` remove the last set_fs() in common code, and remove it for x86 and powerpc v3 Al Viro
2020-09-03 14:28   ` Al Viro
2020-09-03 14:30   ` Christoph Hellwig
2020-09-03 14:30     ` Christoph Hellwig
2020-09-03 14:36     ` Al Viro
2020-09-03 14:36       ` Al Viro
2020-09-03 14:40       ` Christoph Hellwig
2020-09-03 14:40         ` Christoph Hellwig
2020-09-09 17:31   ` Linus Torvalds
2020-09-09 17:31     ` Linus Torvalds
2020-09-09 18:40     ` Segher Boessenkool
2020-09-09 18:40       ` Segher Boessenkool
2020-09-09 21:33       ` Linus Torvalds
2020-09-09 21:33         ` Linus Torvalds
2020-09-10  8:04         ` David Laight
2020-09-10  8:04           ` David Laight
2020-09-10  8:13           ` Christophe Leroy
2020-09-10  8:13             ` Christophe Leroy
2020-09-10  9:26             ` David Laight
2020-09-10  9:26               ` David Laight
2020-09-10 12:26               ` David Laight
2020-09-10 12:26                 ` David Laight
2020-09-10 15:20                 ` Segher Boessenkool
2020-09-10 15:20                   ` Segher Boessenkool
2020-09-10 15:31                   ` David Laight
2020-09-10 15:31                     ` David Laight
2020-09-10 17:15                     ` Segher Boessenkool
2020-09-10 17:15                       ` Segher Boessenkool
2020-09-10 15:16               ` Segher Boessenkool
2020-09-10 15:16                 ` Segher Boessenkool
2020-09-10 15:44         ` Segher Boessenkool
2020-09-10 15:44           ` Segher Boessenkool
2020-09-03 15:49 ` Linus Torvalds
2020-09-03 15:49   ` Linus Torvalds
2020-09-04  6:00 ` Ingo Molnar
2020-09-04  6:00   ` Ingo Molnar
2020-09-04 17:58   ` Alexey Dobriyan
2020-09-04 17:58     ` Alexey Dobriyan
2020-09-04 18:42     ` Linus Torvalds
2020-09-04 18:42       ` Linus Torvalds
2020-09-04 21:01     ` David Laight
2020-09-04 21:01       ` David Laight
2020-09-05  7:16       ` Christophe Leroy
2020-09-05  7:16         ` Christophe Leroy
2020-09-05 10:13         ` David Laight
2020-09-05 10:13           ` David Laight

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=20200903142242.925828-2-hch@lst.de \
    --to=hch@lst.de \
    --cc=adobriyan@gmail.com \
    --cc=keescook@chromium.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mcgrof@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    --cc=x86@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.