From: Ritesh Harjani <riteshh@linux.ibm.com>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Jan Kara <jack@suse.com>,
Andreas Dilger <adilger.kernel@dilger.ca>,
tytso@mit.edu, Eric Whitney <enwlinux@gmail.com>,
Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [PATCH 2/6] ext4: Remove redundant max inline_size check in ext4_da_write_inline_data_begin()
Date: Thu, 13 Jan 2022 08:56:25 +0530 [thread overview]
Message-ID: <fc7f7b3ad709da48c49ab14a2ce86e00a7defe0e.1642044249.git.riteshh@linux.ibm.com> (raw)
In-Reply-To: <cover.1642044249.git.riteshh@linux.ibm.com>
ext4_prepare_inline_data() already checks for ext4_get_max_inline_size()
and returns -ENOSPC. So there is no need to check it twice within
ext4_da_write_inline_data_begin(). This patch removes the extra check.
It also makes it more clean.
No functionality change in this patch.
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
fs/ext4/inline.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 31741e8a462e..c52b0037983d 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -913,7 +913,7 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
struct page **pagep,
void **fsdata)
{
- int ret, inline_size;
+ int ret;
handle_t *handle;
struct page *page;
struct ext4_iloc iloc;
@@ -930,14 +930,9 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
goto out;
}
- inline_size = ext4_get_max_inline_size(inode);
-
- ret = -ENOSPC;
- if (inline_size >= pos + len) {
- ret = ext4_prepare_inline_data(handle, inode, pos + len);
- if (ret && ret != -ENOSPC)
- goto out_journal;
- }
+ ret = ext4_prepare_inline_data(handle, inode, pos + len);
+ if (ret && ret != -ENOSPC)
+ goto out_journal;
/*
* We cannot recurse into the filesystem as the transaction
--
2.31.1
next prev parent reply other threads:[~2022-01-13 3:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 3:26 [PATCH 0/6] ext4/jbd2: inline_data fixes and some cleanups Ritesh Harjani
2022-01-13 3:26 ` [PATCH 1/6] ext4: Fix error handling in ext4_restore_inline_data() Ritesh Harjani
2022-01-13 10:58 ` Jan Kara
2022-01-13 3:26 ` Ritesh Harjani [this message]
2022-01-13 10:58 ` [PATCH 2/6] ext4: Remove redundant max inline_size check in ext4_da_write_inline_data_begin() Jan Kara
2022-01-13 3:26 ` [PATCH 3/6] ext4: Fix error handling in ext4_fc_record_modified_inode() Ritesh Harjani
2022-01-13 11:00 ` Jan Kara
2022-01-13 3:26 ` [PATCH 4/6] jbd2: Cleanup unused functions declarations from jbd2.h Ritesh Harjani
2022-01-13 11:01 ` Jan Kara
2022-01-13 3:26 ` [PATCH 5/6] jbd2: Refactor wait logic for transaction updates into a common function Ritesh Harjani
2022-01-13 11:30 ` Jan Kara
2022-01-13 12:17 ` Ritesh Harjani
2022-01-13 3:26 ` [PATCH 6/6] jbd2: No need to use t_handle_lock in jbd2_journal_wait_updates Ritesh Harjani
2022-01-13 11:27 ` Jan Kara
2022-01-13 12:38 ` Ritesh Harjani
2022-01-17 12:55 ` Ritesh Harjani
2022-01-17 14:38 ` Jan Kara
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=fc7f7b3ad709da48c49ab14a2ce86e00a7defe0e.1642044249.git.riteshh@linux.ibm.com \
--to=riteshh@linux.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=enwlinux@gmail.com \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).