jbd2,ocfs2: move jbd2_journal_submit_inode_data_buffers to ocfs2

jbd2_journal_submit_inode_data_buffers is only used by ocfs2, so move it
there to prepare for removing generic_writepages.

Link: https://lkml.kernel.org/r/20221229161031.391878-5-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 96a1ebc6342db1b36d17298d8b36176ecc9e62ce..b33155dd7001786cdac1b28b0cd46231a6322023 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -177,31 +177,6 @@ static int journal_wait_on_commit_record(journal_t *journal,
        return ret;
 }
 
-/*
- * write the filemap data using writepage() address_space_operations.
- * We don't do block allocation here even for delalloc. We don't
- * use writepages() because with delayed allocation we may be doing
- * block allocation in writepages().
- */
-int jbd2_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)
-{
-       struct address_space *mapping = jinode->i_vfs_inode->i_mapping;
-       struct writeback_control wbc = {
-               .sync_mode =  WB_SYNC_ALL,
-               .nr_to_write = mapping->nrpages * 2,
-               .range_start = jinode->i_dirty_start,
-               .range_end = jinode->i_dirty_end,
-       };
-
-       /*
-        * submit the inode data buffers. We use writepage
-        * instead of writepages. Because writepages can do
-        * block allocation with delalloc. We need to write
-        * only allocated blocks here.
-        */
-       return generic_writepages(mapping, &wbc);
-}
-
 /* Send all the data buffers related to an inode */
 int jbd2_submit_inode_data(journal_t *journal, struct jbd2_inode *jinode)
 {

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 4095fe91457fdcb7a5b1ee13a1c1e39bee2a7857..e80c781731f82957b8ef0cea3ea3585915258200 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -89,7 +89,6 @@ EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
 EXPORT_SYMBOL(jbd2_journal_force_commit);
 EXPORT_SYMBOL(jbd2_journal_inode_ranged_write);
 EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait);
-EXPORT_SYMBOL(jbd2_journal_submit_inode_data_buffers);
 EXPORT_SYMBOL(jbd2_journal_finish_inode_data_buffers);
 EXPORT_SYMBOL(jbd2_journal_init_jbd_inode);
 EXPORT_SYMBOL(jbd2_journal_release_jbd_inode);

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 3fb98b4569a28b7842692356cae35feedcfe0607..59f612684c51787fd73857f23cfdb52f42df2d76 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -15,6 +15,7 @@
 #include <linux/time.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/writeback.h>
 
 #include <cluster/masklog.h>
 
@@ -841,6 +842,19 @@ bail:
        return status;
 }
 
+static int ocfs2_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)
+{
+       struct address_space *mapping = jinode->i_vfs_inode->i_mapping;
+       struct writeback_control wbc = {
+               .sync_mode =  WB_SYNC_ALL,
+               .nr_to_write = mapping->nrpages * 2,
+               .range_start = jinode->i_dirty_start,
+               .range_end = jinode->i_dirty_end,
+       };
+
+       return generic_writepages(mapping, &wbc);
+}
+
 int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)
 {
        int status = -1;
@@ -910,7 +924,7 @@ int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)
 
        journal->j_journal = j_journal;
        journal->j_journal->j_submit_inode_data_buffers =
-               jbd2_journal_submit_inode_data_buffers;
+               ocfs2_journal_submit_inode_data_buffers;
        journal->j_journal->j_finish_inode_data_buffers =
                jbd2_journal_finish_inode_data_buffers;
        journal->j_inode = inode;

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 2170e0cc279d5cb823f5be2cca53cc3d9b5eece8..5962072a4b19e6e92de7f568dd4e5b8d666aad09 100644 (file)
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1570,8 +1570,6 @@ extern int           jbd2_journal_inode_ranged_write(handle_t *handle,
 extern int        jbd2_journal_inode_ranged_wait(handle_t *handle,
                        struct jbd2_inode *inode, loff_t start_byte,
                        loff_t length);
-extern int        jbd2_journal_submit_inode_data_buffers(
-                       struct jbd2_inode *jinode);
 extern int        jbd2_journal_finish_inode_data_buffers(
                        struct jbd2_inode *jinode);
 extern int        jbd2_journal_begin_ordered_truncate(journal_t *journal,