Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d605179 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

JBD2: Use the incompat macro for testing the incompat feature. 



JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT needs to be checked with
JBD2_HAS_INCOMPAT_FEATURE

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent c4b8e635

fs/jbd2/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int journal_submit_commit_record(journal_t *journal, 
	bh->b_end_io = journal_end_buffer_io_sync;



	if (journal->j_flags & JBD2_BARRIER &&

		!JBD2_HAS_COMPAT_FEATURE(journal,

		!JBD2_HAS_INCOMPAT_FEATURE(journal,

					 JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)) {

		set_buffer_ordered(bh);

		barrier_done = 1;

fs/jbd2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static int do_one_pass(journal_t *journal, 
				if (chksum_err) {

					info->end_transaction = next_commit_ID;



					if (!JBD2_HAS_COMPAT_FEATURE(journal,

					if (!JBD2_HAS_INCOMPAT_FEATURE(journal,

					   JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)){

						printk(KERN_ERR

						       "JBD: Transaction %u "