2023-04-16 18:40:11

by Ritesh Harjani

Subject: [RFCv1 1/4] ext4: kill unused function ext4_journalled_write_inline_data

Commit 3f079114bf522 ("ext4: Convert data=journal writeback to use ext4_writepages()")
Added support for writeback of journalled data into ext4_writepages()
and killed function __ext4_journalled_writepage() which used to call
ext4_journalled_write_inline_data() for inline data.
This function got left over by mistake. Hence kill it's definition as
no one uses it.

Signed-off-by: Ritesh Harjani (IBM) <[email protected]>
---
fs/ext4/ext4.h | 4 ----
fs/ext4/inline.c | 24 ------------------------
2 files changed, 28 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 83f0cc02250f..b00597b41c96 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -3558,10 +3558,6 @@ extern int ext4_write_inline_data_end(struct inode *inode,
loff_t pos, unsigned len,
unsigned copied,
struct page *page);
-extern struct buffer_head *
-ext4_journalled_write_inline_data(struct inode *inode,
- unsigned len,
- struct page *page);
extern int ext4_da_write_inline_data_begin(struct address_space *mapping,
struct inode *inode,
loff_t pos, unsigned len,
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index b9fb1177fff6..062c7747bb40 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -812,30 +812,6 @@ int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,
return ret ? ret : copied;
}

-struct buffer_head *
-ext4_journalled_write_inline_data(struct inode *inode,
- unsigned len,
- struct page *page)
-{
- int ret, no_expand;
- void *kaddr;
- struct ext4_iloc iloc;
-
- ret = ext4_get_inode_loc(inode, &iloc);
- if (ret) {
- ext4_std_error(inode->i_sb, ret);
- return NULL;
- }
-
- ext4_write_lock_xattr(inode, &no_expand);
- kaddr = kmap_atomic(page);
- ext4_write_inline_data(inode, &iloc, kaddr, 0, len);
- kunmap_atomic(kaddr);
- ext4_write_unlock_xattr(inode, &no_expand);
-
- return iloc.bh;
-}
-
/*
* Try to make the page cache and handle ready for the inline data case.
* We can call this function in 2 cases:
--
2.39.2

2023-04-16 19:45:31

by Matthew Wilcox

Subject: Re: [RFCv1 1/4] ext4: kill unused function ext4_journalled_write_inline_data

On Mon, Apr 17, 2023 at 12:01:50AM +0530, Ritesh Harjani (IBM) wrote:
> Commit 3f079114bf522 ("ext4: Convert data=journal writeback to use ext4_writepages()")
> Added support for writeback of journalled data into ext4_writepages()
> and killed function __ext4_journalled_writepage() which used to call
> ext4_journalled_write_inline_data() for inline data.
> This function got left over by mistake. Hence kill it's definition as
> no one uses it.
>
> Signed-off-by: Ritesh Harjani (IBM) <[email protected]>

Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>