From: Julian Sun <sunjunchao2870@gmail.com>
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
Julian Sun <sunjunchao2870@gmail.com>
Subject: [PATCH v2 5/5] ext4: Refactor out ext4_try_to_write_inline_data()
Date: Tue, 7 Jan 2025 12:57:30 +0800 [thread overview]
Message-ID: <20250107045730.1837808-1-sunjunchao2870@gmail.com> (raw)
In-Reply-To: <20250107044702.1836852-1-sunjunchao2870@gmail.com>
Refactor ext4_try_to_write_inline_data() to simplify its
implementation by directly invoking ext4_generic_write_inline_data().
Signed-off-by: Julian Sun <sunjunchao2870@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
fs/ext4/inline.c | 77 ++----------------------------------------------
1 file changed, 3 insertions(+), 74 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 58d8fcfbecba..a651a033e518 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -757,81 +757,10 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
loff_t pos, unsigned len,
struct folio **foliop)
{
- int ret;
- handle_t *handle;
- struct folio *folio;
- struct ext4_iloc iloc;
-
if (pos + len > ext4_get_max_inline_size(inode))
- goto convert;
-
- ret = ext4_get_inode_loc(inode, &iloc);
- if (ret)
- return ret;
-
- /*
- * The possible write could happen in the inode,
- * so try to reserve the space in inode first.
- */
- handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
- if (IS_ERR(handle)) {
- ret = PTR_ERR(handle);
- handle = NULL;
- goto out;
- }
-
- ret = ext4_prepare_inline_data(handle, inode, pos + len);
- if (ret && ret != -ENOSPC)
- goto out;
-
- /* We don't have space in inline inode, so convert it to extent. */
- if (ret == -ENOSPC) {
- ext4_journal_stop(handle);
- brelse(iloc.bh);
- goto convert;
- }
-
- ret = ext4_journal_get_write_access(handle, inode->i_sb, iloc.bh,
- EXT4_JTR_NONE);
- if (ret)
- goto out;
-
- folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,
- mapping_gfp_mask(mapping));
- if (IS_ERR(folio)) {
- ret = PTR_ERR(folio);
- goto out;
- }
-
- *foliop = folio;
- down_read(&EXT4_I(inode)->xattr_sem);
- if (!ext4_has_inline_data(inode)) {
- ret = 0;
- folio_unlock(folio);
- folio_put(folio);
- goto out_up_read;
- }
-
- if (!folio_test_uptodate(folio)) {
- ret = ext4_read_inline_folio(inode, folio);
- if (ret < 0) {
- folio_unlock(folio);
- folio_put(folio);
- goto out_up_read;
- }
- }
-
- ret = 1;
- handle = NULL;
-out_up_read:
- up_read(&EXT4_I(inode)->xattr_sem);
-out:
- if (handle && (ret != 1))
- ext4_journal_stop(handle);
- brelse(iloc.bh);
- return ret;
-convert:
- return ext4_convert_inline_data_to_extent(mapping, inode);
+ return ext4_convert_inline_data_to_extent(mapping, inode);
+ return ext4_generic_write_inline_data(mapping, inode, pos, len,
+ foliop, NULL, false);
}
int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,
--
2.39.5
next prev parent reply other threads:[~2025-01-07 4:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 4:46 [PATCH v2 0/5] Some cleanups and refactoring of the inline data code Julian Sun
2025-01-07 4:46 ` [PATCH v2 1/5] ext4: Remove a redundant return statement Julian Sun
2025-01-07 4:46 ` [PATCH v2 2/5] ext4: Don't set EXT4_STATE_MAY_INLINE_DATA for ea inodes Julian Sun
2025-01-07 4:55 ` [PATCH v2 3/5] ext4: Introduce a new helper function ext4_generic_write_inline_data() Julian Sun
2025-01-07 4:57 ` [PATCH v2 4/5] ext4: Replace ext4_da_write_inline_data_begin() with ext4_generic_write_inline_data() Julian Sun
2025-01-07 10:54 ` Jan Kara
2025-01-07 4:57 ` Julian Sun [this message]
2025-03-18 3:41 ` [PATCH v2 0/5] Some cleanups and refactoring of the inline data code Theodore Ts'o
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=20250107045730.1837808-1-sunjunchao2870@gmail.com \
--to=sunjunchao2870@gmail.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@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