> generic_sync_sb_inodes was removed in d8a8559cd7a9cc,
> writeback_inodes_sb and sync_inodes_sb should replace them.
Second version, now also fixes the last comments relating to
generic_sync_sb_inodes.
---
fs/reiser4/context.h | 2 +-
fs/reiser4/entd.c | 4 +++-
fs/reiser4/super_ops.c | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
Index: linux/fs/reiser4/entd.c
===================================================================
--- linux.orig/fs/reiser4/entd.c
+++ linux/fs/reiser4/entd.c
@@ -241,7 +241,9 @@ static void entd_flush(struct super_bloc
if (rq->wbc->nr_to_write > 0) {
rq->wbc->range_start = 0;
rq->wbc->range_end = LLONG_MAX;
- generic_sync_sb_inodes(rq->wbc);
+ writeback_inodes_sb(super);
+ if (rq->wbc->sync_mode == WB_SYNC_ALL)
+ sync_inodes_sb(super);
}
rq->wbc->nr_to_write = ENTD_CAPTURE_APAGE_BURST;
reiser4_writeout(super, rq->wbc);
Index: linux/fs/reiser4/super_ops.c
===================================================================
--- linux.orig/fs/reiser4/super_ops.c
+++ linux/fs/reiser4/super_ops.c
@@ -384,7 +384,7 @@ static void reiser4_clear_inode(struct i
* @wbc:
*
* This method is called by background and non-backgound writeback. Reiser4's
- * implementation uses generic_sync_sb_inodes to call reiser4_writepages for
+ * implementation uses writeback/sync_inodes_sb to call reiser4_writepages for
* each of dirty inodes. Reiser4_writepages handles pages dirtied via shared
* mapping - dirty pages get into atoms. Writeout is called to flush some
* atoms.
@@ -412,7 +412,9 @@ static void reiser4_sync_inodes(struct s
* call reiser4_writepages for each of dirty inodes to turn dirty pages
* into transactions if they were not yet.
*/
- generic_sync_sb_inodes(wbc);
+ writeback_inodes_sb(super);
+ if (wbc->sync_mode == WB_SYNC_ALL)
+ sync_inodes_sb(super);
/* flush goes here */
wbc->nr_to_write = to_write;
Index: linux/fs/reiser4/context.h
===================================================================
--- linux.orig/fs/reiser4/context.h
+++ linux/fs/reiser4/context.h
@@ -66,7 +66,7 @@ struct reiser4_context {
/* count non-trivial jnode_set_dirty() calls */
unsigned long nr_marked_dirty;
- /* reiser4_sync_inodes calls (via generic_sync_sb_inodes)
+ /* reiser4_sync_inodes calls (via writeback/sync_inodes_sb)
* reiser4_writepages for each of dirty inodes. Reiser4_writepages
* captures pages. When number of pages captured in one
* reiser4_sync_inodes reaches some threshold - some atoms get
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
