From: Edward Shishkin Make reiser4_sync_inodes non-void Signed-off-by: Edward Shishkin Signed-off-by: Andrew Morton --- fs/reiser4/super_ops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff -puN fs/reiser4/super_ops.c~reiser4-make-sync_inodes-non-void fs/reiser4/super_ops.c --- a/fs/reiser4/super_ops.c~reiser4-make-sync_inodes-non-void +++ a/fs/reiser4/super_ops.c @@ -390,15 +390,16 @@ static void reiser4_clear_inode(struct i * mapping - dirty pages get into atoms. Writeout is called to flush some * atoms. */ -static void reiser4_sync_inodes(struct super_block *super, - struct writeback_control *wbc) +static int reiser4_sync_inodes(struct super_block *super, + struct writeback_control *wbc) { reiser4_context *ctx; long to_write; + int ret; if (wbc->for_kupdate) /* reiser4 has its own means of periodical write-out */ - return; + return 0; to_write = wbc->nr_to_write; assert("vs-49", wbc->older_than_this == NULL); @@ -406,14 +407,14 @@ static void reiser4_sync_inodes(struct s ctx = reiser4_init_context(super); if (IS_ERR(ctx)) { warning("vs-13", "failed to init context"); - return; + return PTR_ERR(ctx); } /* * call reiser4_writepages for each of dirty inodes to turn dirty pages * into transactions if they were not yet. */ - generic_sync_sb_inodes(super, wbc); + ret = generic_sync_sb_inodes(super, wbc); /* flush goes here */ wbc->nr_to_write = to_write; @@ -422,6 +423,7 @@ static void reiser4_sync_inodes(struct s /* avoid recursive calls to ->sync_inodes */ context_set_commit_async(ctx); reiser4_exit_context(ctx); + return ret; } /** _