The atoms generated by reiser4_trim_fs(), despite being empty (zero
capture_count), still have non-empty delete sets which have to be
processed.
Also the empty atom check has been moved after changing atom stage
to ASTAGE_PRE_COMMIT, because reiser4_post_write_back_hook() requires
atom to be unlocked.
Signed-off-by: Ivan Shapovalov <intelfx100@xxxxxxxxx>
---
fs/reiser4/txnmgr.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/fs/reiser4/txnmgr.c b/fs/reiser4/txnmgr.c
index 2862940..2efdf85 100644
--- a/fs/reiser4/txnmgr.c
+++ b/fs/reiser4/txnmgr.c
@@ -1064,9 +1064,6 @@ static int commit_current_atom(long *nr_submitted, txn_atom ** atom)
return RETERR(-E_REPEAT);
}
- if ((*atom)->capture_count == 0)
- goto done;
-
/* Up to this point we have been flushing and after flush is called we
return -E_REPEAT. Now we can commit. We cannot return -E_REPEAT
at this point, commit should be successful. */
@@ -1074,6 +1071,14 @@ static int commit_current_atom(long *nr_submitted, txn_atom ** atom)
ON_DEBUG(((*atom)->committer = current));
spin_unlock_atom(*atom);
+ if ((*atom)->capture_count == 0) {
+ /* Process the atom's delete set.
+ * Even if the atom has no captured nodes, the delete set may
+ * still be non-empty (see e. g. reiser4_trim_fs()). */
+ reiser4_post_write_back_hook();
+ goto done;
+ }
+
ret = current_atom_complete_writes();
if (ret)
return ret;
@@ -1100,8 +1105,8 @@ static int commit_current_atom(long *nr_submitted, txn_atom ** atom)
reiser4_invalidate_list(ATOM_WB_LIST(*atom));
assert("zam-927", list_empty(&(*atom)->inodes));
+done:
spin_lock_atom(*atom);
- done:
reiser4_atom_set_stage(*atom, ASTAGE_DONE);
ON_DEBUG((*atom)->committer = NULL);
--
2.0.4
--
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
