[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20240810082814.3709867-4-zhangshida@kylinos.cn>
Date: Sat, 10 Aug 2024 16:28:14 +0800
From: zhangshida <starzhangzsd@...il.com>
To: tytso@....edu,
adilger.kernel@...ger.ca,
jack@...e.com
Cc: linux-ext4@...r.kernel.org,
linux-kernel@...r.kernel.org,
zhangshida@...inos.cn,
starzhangzsd@...il.com
Subject: [RFC PATCH v3 3/3] ext4: remove the superfluous things left by __block_write_begin
From: Shida Zhang <zhangshida@...inos.cn>
This kinda revert the commit 56d35a4cd13e("ext4: Fix dirtying of
journalled buffers in data=journal mode") made by Jan 14 years ago.
Now that the whole __block_write_begin and improperly dirty things
were removed from the code. Remove the related code, too.
Now we get a better and cleaner world!
Signed-off-by: Shida Zhang <zhangshida@...inos.cn>
---
fs/ext4/inode.c | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 4c34827da56e..cb6de9921655 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1023,27 +1023,13 @@ static int ext4_dirty_journalled_data(handle_t *handle, struct buffer_head *bh)
int do_journal_get_write_access(handle_t *handle, struct inode *inode,
struct buffer_head *bh)
{
- int dirty = buffer_dirty(bh);
- int ret;
+ ASSERT(!buffer_dirty(bh));
if (!buffer_mapped(bh) || buffer_freed(bh))
return 0;
- /*
- * __block_write_begin() could have dirtied some buffers. Clean
- * the dirty bit as jbd2_journal_get_write_access() could complain
- * otherwise about fs integrity issues. Setting of the dirty bit
- * by __block_write_begin() isn't a real problem here as we clear
- * the bit before releasing a page lock and thus writeback cannot
- * ever write the buffer.
- */
- if (dirty)
- clear_buffer_dirty(bh);
BUFFER_TRACE(bh, "get write access");
- ret = ext4_journal_get_write_access(handle, inode->i_sb, bh,
+ return ext4_journal_get_write_access(handle, inode->i_sb, bh,
EXT4_JTR_NONE);
- if (!ret && dirty)
- ret = ext4_dirty_journalled_data(handle, bh);
- return ret;
}
int ext4_block_write_begin(handle_t *handle, struct folio *folio,
@@ -1246,7 +1232,7 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
folio_unlock(folio);
/*
- * __block_write_begin may have instantiated a few blocks
+ * ext4_block_write_begin may have instantiated a few blocks
* outside i_size. Trim these off again. Don't need
* i_size_read because we hold i_rwsem.
*
--
2.33.0
Powered by blists - more mailing lists