Commit acf3bb00 authored by Tristan Ye's avatar Tristan Ye Committed by Joel Becker

Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number.

Current refcounttree codes actually didn't writeback the new pages out in
write-back mode, due to a bug of always passing a ZERO number of clusters
to 'ocfs2_cow_sync_writeback', the patch tries to pass a proper one in.
Signed-off-by: default avatarTristan Ye <tristan.ye@oracle.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJoel Becker <jlbec@evilplan.org>
parent 705773a6
...@@ -3228,7 +3228,7 @@ static int ocfs2_make_clusters_writable(struct super_block *sb, ...@@ -3228,7 +3228,7 @@ static int ocfs2_make_clusters_writable(struct super_block *sb,
u32 num_clusters, unsigned int e_flags) u32 num_clusters, unsigned int e_flags)
{ {
int ret, delete, index, credits = 0; int ret, delete, index, credits = 0;
u32 new_bit, new_len; u32 new_bit, new_len, orig_num_clusters;
unsigned int set_len; unsigned int set_len;
struct ocfs2_super *osb = OCFS2_SB(sb); struct ocfs2_super *osb = OCFS2_SB(sb);
handle_t *handle; handle_t *handle;
...@@ -3261,6 +3261,8 @@ static int ocfs2_make_clusters_writable(struct super_block *sb, ...@@ -3261,6 +3261,8 @@ static int ocfs2_make_clusters_writable(struct super_block *sb,
goto out; goto out;
} }
orig_num_clusters = num_clusters;
while (num_clusters) { while (num_clusters) {
ret = ocfs2_get_refcount_rec(ref_ci, context->ref_root_bh, ret = ocfs2_get_refcount_rec(ref_ci, context->ref_root_bh,
p_cluster, num_clusters, p_cluster, num_clusters,
...@@ -3348,7 +3350,8 @@ static int ocfs2_make_clusters_writable(struct super_block *sb, ...@@ -3348,7 +3350,8 @@ static int ocfs2_make_clusters_writable(struct super_block *sb,
* in write-back mode. * in write-back mode.
*/ */
if (context->get_clusters == ocfs2_di_get_clusters) { if (context->get_clusters == ocfs2_di_get_clusters) {
ret = ocfs2_cow_sync_writeback(sb, context, cpos, num_clusters); ret = ocfs2_cow_sync_writeback(sb, context, cpos,
orig_num_clusters);
if (ret) if (ret)
mlog_errno(ret); mlog_errno(ret);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment