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 3/5] ext4: Introduce a new helper function ext4_generic_write_inline_data()
Date: Tue, 7 Jan 2025 12:55:49 +0800 [thread overview]
Message-ID: <20250107045549.1837589-1-sunjunchao2870@gmail.com> (raw)
In-Reply-To: <20250107044702.1836852-1-sunjunchao2870@gmail.com>
A new function, ext4_generic_write_inline_data(), is introduced
to provide a generic implementation of the common logic found in
ext4_da_write_inline_data_begin() and ext4_try_to_write_inline_data().
This function will be utilized in the subsequent two patches.
Signed-off-by: Julian Sun <sunjunchao2870@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
fs/ext4/inline.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 3536ca7e4fcc..3e103e003afb 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -20,6 +20,11 @@
#define EXT4_INLINE_DOTDOT_OFFSET 2
#define EXT4_INLINE_DOTDOT_SIZE 4
+
+static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
+ struct inode *inode,
+ void **fsdata);
+
static int ext4_get_inline_size(struct inode *inode)
{
if (EXT4_I(inode)->i_inline_off)
@@ -652,6 +657,87 @@ static int ext4_convert_inline_data_to_extent(struct address_space *mapping,
return ret;
}
+static int ext4_generic_write_inline_data(struct address_space *mapping,
+ struct inode *inode,
+ loff_t pos, unsigned len,
+ struct folio **foliop,
+ void **fsdata, bool da)
+{
+ int ret;
+ handle_t *handle;
+ struct folio *folio;
+ struct ext4_iloc iloc;
+ int retries = 0;
+
+ ret = ext4_get_inode_loc(inode, &iloc);
+ if (ret)
+ return ret;
+
+retry_journal:
+ handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
+ if (IS_ERR(handle)) {
+ ret = PTR_ERR(handle);
+ goto out_release_bh;
+ }
+
+ ret = ext4_prepare_inline_data(handle, inode, pos + len);
+ if (ret && ret != -ENOSPC)
+ goto out_stop_journal;
+
+ if (ret == -ENOSPC) {
+ ext4_journal_stop(handle);
+ if (!da) {
+ brelse(iloc.bh);
+ /* Retry inside */
+ return ext4_convert_inline_data_to_extent(mapping, inode);
+ }
+
+ ret = ext4_da_convert_inline_data_to_extent(mapping, inode, fsdata);
+ if (ret == -ENOSPC &&
+ ext4_should_retry_alloc(inode->i_sb, &retries))
+ goto retry_journal;
+ goto out_release_bh;
+ }
+
+ folio = __filemap_get_folio(mapping, 0, FGP_WRITEBEGIN | FGP_NOFS,
+ mapping_gfp_mask(mapping));
+ if (IS_ERR(folio)) {
+ ret = PTR_ERR(folio);
+ goto out_stop_journal;
+ }
+
+ down_read(&EXT4_I(inode)->xattr_sem);
+ /* Someone else had converted it to extent */
+ if (!ext4_has_inline_data(inode)) {
+ ret = 0;
+ goto out_release_folio;
+ }
+
+ if (!folio_test_uptodate(folio)) {
+ ret = ext4_read_inline_folio(inode, folio);
+ if (ret < 0)
+ goto out_release_folio;
+ }
+
+ ret = ext4_journal_get_write_access(handle, inode->i_sb, iloc.bh, EXT4_JTR_NONE);
+ if (ret)
+ goto out_release_folio;
+ *foliop = folio;
+ up_read(&EXT4_I(inode)->xattr_sem);
+ brelse(iloc.bh);
+ return 1;
+
+out_release_folio:
+ up_read(&EXT4_I(inode)->xattr_sem);
+ folio_unlock(folio);
+ folio_put(folio);
+out_stop_journal:
+ ext4_journal_stop(handle);
+out_release_bh:
+ brelse(iloc.bh);
+ return ret;
+}
+
/*
* Try to write data in the inode.
* If the inode has inline data, check whether the new write can be
--
2.39.5
next prev parent reply other threads:[~2025-01-07 4:56 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 ` Julian Sun [this message]
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 ` [PATCH v2 5/5] ext4: Refactor out ext4_try_to_write_inline_data() Julian Sun
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=20250107045549.1837589-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