linux-ext4 - [PATCH 3/5] ocfs2: Update ocfs2 routines to use the updated journal routines to specify gfp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <BANLkTi=H5zs9KnrUtXd=Q4uz3rTFGzfqhg@mail.gmail.com>
Date:	Sun, 24 Apr 2011 17:15:35 -0700
From:	Manish Katiyar <mkatiyar@...il.com>
To:	ext4 <linux-ext4@...r.kernel.org>
Cc:	Manish Katiyar <manish.katiyar@...ibm.com>,
	Jan Kara <jack@...e.cz>, "Theodore Ts'o" <tytso@....edu>
Subject: [PATCH 3/5] ocfs2: Update ocfs2 routines to use the updated journal
 routines to specify gfp_mask for transaction allocation.

Update ocfs2 routines to use the updated journal routines passing an
extra parameter to specify whether transaction allocation can fail or
not.


Signed-off-by: Manish Katiyar <mkatiyar@...il.com>
---
 fs/ocfs2/journal.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index b141a44..51c60be 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -338,6 +338,16 @@ finally:
 	return status;
 }

+static handle_t *ocfs2_journal_start(journal_t *journal, int blocks)
+{
+	return jbd2_journal_start(journal, blocks, false);
+}
+
+static int ocfs2_journal_restart(handle_t *handle, int blocks)
+{
+	return jbd2_journal_restart(handle, blocks, false);
+}
+
 handle_t *ocfs2_start_trans(struct ocfs2_super *osb, int max_buffs)
 {
 	journal_t *journal = osb->journal->j_journal;
@@ -353,11 +363,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 ocfs2_journal_start(journal, max_buffs);

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

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

@@ -437,7 +447,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks)

 	if (status > 0) {
 		trace_ocfs2_extend_trans_restart(old_nblocks + nblocks);
-		status = jbd2_journal_restart(handle,
+		status = ocfs2_journal_restart(handle,
 					      old_nblocks + nblocks);
 		if (status < 0) {
 			mlog_errno(status);
-- 
1.7.1


-- 
Thanks -
Manish

View attachment "0003-Update-ocfs-routines-to-use-the-updated-journal-rout.patch" of type "text/x-patch" (1861 bytes)