2011-01-23 03:36:59

by Manish Katiyar

[permalink] [raw]
Subject: [PATCH 3/3] : Update ocfs2 for the changed jbd2 transaction allocation routines

Hi Jan,

Update ocfs2 to use the updated transaction allocation routine. They
still pass the old flag.

Signed-off-by: Manish Katiyar <[email protected]>
---
fs/ocfs2/journal.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index faa2303..6435a58 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -356,11 +356,11 @@ handle_t *ocfs2_start_trans(struct ocfs2_super
*osb, int max_buffs)

/* Nested transaction? Just return the handle... */
if (journal_current_handle())
- return jbd2_journal_start(journal, max_buffs);
+ return jbd2_journal_start(journal, max_buffs, false);

down_read(&osb->journal->j_trans_barrier);

- handle = jbd2_journal_start(journal, max_buffs);
+ handle = jbd2_journal_start(journal, max_buffs, false);
if (IS_ERR(handle)) {
up_read(&osb->journal->j_trans_barrier);

@@ -444,7 +444,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks)
"jbd2_journal_extend failed, trying "
"jbd2_journal_restart\n");
status = jbd2_journal_restart(handle,
- old_nblocks + nblocks);
+ old_nblocks + nblocks, false);
if (status < 0) {
mlog_errno(status);
goto bail;
--
1.6.0.4


--
Thanks -
Manish
==================================
[$\*.^ -- I miss being one of them
==================================


2011-01-23 03:51:58

by Joel Becker

[permalink] [raw]
Subject: Re: [PATCH 3/3] : Update ocfs2 for the changed jbd2 transaction allocation routines

On Sat, Jan 22, 2011 at 07:36:38PM -0800, Manish Katiyar wrote:
> Hi Jan,
>
> Update ocfs2 to use the updated transaction allocation routine. They
> still pass the old flag.
>
> Signed-off-by: Manish Katiyar <[email protected]>

I think this is correct. Thanks for noticing!

Joel

--

Life's Little Instruction Book #20

"Be forgiving of yourself and others."

http://www.jlbec.org/
[email protected]