From: liusong@tom.com
To: tytso@mit.edu, adilger.kernel@dilger.ca
Cc: liu.song11@zte.com.cn, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ext4: direct return when jinode allocate failed in ext4_inode_attach_jinode
Date: Mon, 15 Oct 2018 00:05:22 +0800 [thread overview]
Message-ID: <20181014160522.3395-1-liusong@tom.com> (raw)
From: Liu Song <liu.song11@zte.com.cn>
Allocating memory for jinode do not need protected by *i_lock*.
Should return directly if memory allocation fails without holding
a spinlock.
Signed-off-by: Liu Song <liu.song11@zte.com.cn>
---
fs/ext4/inode.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index d0dd585add6a..341d84521d11 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4382,12 +4382,11 @@ int ext4_inode_attach_jinode(struct inode *inode)
return 0;
jinode = jbd2_alloc_inode(GFP_KERNEL);
+ if (!jinode)
+ return -ENOMEM;
+
spin_lock(&inode->i_lock);
if (!ei->jinode) {
- if (!jinode) {
- spin_unlock(&inode->i_lock);
- return -ENOMEM;
- }
ei->jinode = jinode;
jbd2_journal_init_jbd_inode(ei->jinode, inode);
jinode = NULL;
--
2.17.1
reply other threads:[~2018-10-14 16:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20181014160522.3395-1-liusong@tom.com \
--to=liusong@tom.com \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liu.song11@zte.com.cn \
--cc=tytso@mit.edu \
/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).