summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/journal.c
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-12-03 16:43:01 -0800
committerMark Fasheh <mark.fasheh@oracle.com>2007-12-17 10:51:23 -0800
commite8aed3450c0afd6fdb79ec233f806e3e69454dfe (patch)
treeaa83824230c1b0c58fe9ec68d007c35f42b90fa7 /fs/ocfs2/journal.c
parent0879c584ffcccd50a8d0f72cab3a51702613f901 (diff)
downloadop-kernel-dev-e8aed3450c0afd6fdb79ec233f806e3e69454dfe.zip
op-kernel-dev-e8aed3450c0afd6fdb79ec233f806e3e69454dfe.tar.gz
ocfs2: Re-journal buffers after transaction extend
ocfs2_extend_trans() might call journal_restart() which will commit dirty buffers and then restart the transaction. This means that any buffers which still need changes should be passed to journal_access() again. Some paths during extend weren't doing this right. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r--fs/ocfs2/journal.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 0e1250c..8d81f6c 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -174,6 +174,12 @@ int ocfs2_commit_trans(struct ocfs2_super *osb,
* transaction. extend_trans will either extend the current handle by
* nblocks, or commit it and start a new one with nblocks credits.
*
+ * This might call journal_restart() which will commit dirty buffers
+ * and then restart the transaction. Before calling
+ * ocfs2_extend_trans(), any changed blocks should have been
+ * dirtied. After calling it, all blocks which need to be changed must
+ * go through another set of journal_access/journal_dirty calls.
+ *
* WARNING: This will not release any semaphores or disk locks taken
* during the transaction, so make sure they were taken *before*
* start_trans or we'll have ordering deadlocks.
OpenPOWER on IntegriCloud