From: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
To: linux-ext4@vger.kernel.org
Cc: "Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
linux-kernel@vger.kernel.org, kernel-dev@igalia.com,
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Subject: [PATCH 4/5] ext4: add a wrapper to update i_inline_off and i_inline_size
Date: Fri, 6 Dec 2024 14:28:27 -0300 [thread overview]
Message-ID: <20241206172828.3219989-5-cascardo@igalia.com> (raw)
In-Reply-To: <20241206172828.3219989-1-cascardo@igalia.com>
They were updated in three different places, with slight variations. This
will make it easier to change them.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
---
fs/ext4/inline.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index c3d2fcae6191..cd2014af9823 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -129,6 +129,15 @@ int ext4_get_max_inline_size(struct inode *inode)
return max_inline_size + EXT4_MIN_INLINE_DATA_SIZE;
}
+static void ext4_update_inline_off_size(struct inode *inode,
+ struct ext4_inode *raw_inode,
+ struct ext4_xattr_entry *entry)
+{
+ EXT4_I(inode)->i_inline_off = (u16)((void *)entry - (void *)raw_inode);
+ EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE +
+ le32_to_cpu(entry->e_value_size);
+}
+
/*
* this function does not take xattr_sem, which is OK because it is
* currently only used in a code path coming form ext4_iget, before
@@ -163,10 +172,8 @@ int ext4_find_inline_data_nolock(struct inode *inode)
error = -EFSCORRUPTED;
goto out;
}
- EXT4_I(inode)->i_inline_off = (u16)((void *)is.s.here -
- (void *)ext4_raw_inode(&is.iloc));
- EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE +
- le32_to_cpu(is.s.here->e_value_size);
+ ext4_update_inline_off_size(inode, ext4_raw_inode(&is.iloc),
+ is.s.here);
}
out:
brelse(is.iloc.bh);
@@ -354,9 +361,8 @@ static int ext4_create_inline_data(handle_t *handle,
memset((void *)ext4_raw_inode(&is.iloc)->i_block,
0, EXT4_MIN_INLINE_DATA_SIZE);
- EXT4_I(inode)->i_inline_off = (u16)((void *)is.s.here -
- (void *)ext4_raw_inode(&is.iloc));
- EXT4_I(inode)->i_inline_size = len + EXT4_MIN_INLINE_DATA_SIZE;
+ ext4_update_inline_off_size(inode, ext4_raw_inode(&is.iloc), is.s.here);
+
ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS);
ext4_set_inode_flag(inode, EXT4_INODE_INLINE_DATA);
get_bh(is.iloc.bh);
@@ -420,10 +426,7 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode,
if (error)
goto out;
- EXT4_I(inode)->i_inline_off = (u16)((void *)is.s.here -
- (void *)ext4_raw_inode(&is.iloc));
- EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE +
- le32_to_cpu(is.s.here->e_value_size);
+ ext4_update_inline_off_size(inode, ext4_raw_inode(&is.iloc), is.s.here);
ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
get_bh(is.iloc.bh);
error = ext4_mark_iloc_dirty(handle, inode, &is.iloc);
--
2.34.1
next prev parent reply other threads:[~2024-12-06 17:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 17:28 [PATCH 0/5] ext4: inline data cleanup Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 1/5] ext4: inline: remove extra size check when writing data Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 2/5] ext4: inline: use cached i_inline_size instead of e_value_size Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` [PATCH 3/5] ext4: introduce wrapper to read data from inode Thadeu Lima de Souza Cascardo
2024-12-06 17:28 ` Thadeu Lima de Souza Cascardo [this message]
2024-12-06 17:28 ` [PATCH 5/5] ext4: make i_inline_off point to data Thadeu Lima de Souza Cascardo
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=20241206172828.3219989-5-cascardo@igalia.com \
--to=cascardo@igalia.com \
--cc=adilger.kernel@dilger.ca \
--cc=kernel-dev@igalia.com \
--cc=linux-ext4@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
all inboxes | Powered by JetHome®