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

Commit 4524451e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

jbd: replace barriers with explicit flush / FUA usage 



Switch to the WRITE_FLUSH_FUA flag for journal commits and remove the
EOPNOTSUPP detection for barriers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent f8c131f5

fs/jbd/commit.c

+3 −27
Original line number Diff line number Diff line
@@ -137,34 +137,10 @@ static int journal_write_commit_record(journal_t *journal, 
	JBUFFER_TRACE(descriptor, "write commit block");

	set_buffer_dirty(bh);



	if (journal->j_flags & JFS_BARRIER) {

		ret = __sync_dirty_buffer(bh, WRITE_SYNC | WRITE_BARRIER);



		/*

		 * Is it possible for another commit to fail at roughly

		 * the same time as this one?  If so, we don't want to

		 * trust the barrier flag in the super, but instead want

		 * to remember if we sent a barrier request

		 */

		if (ret == -EOPNOTSUPP) {

			char b[BDEVNAME_SIZE];



			printk(KERN_WARNING

				"JBD: barrier-based sync failed on %s - "

				"disabling barriers\n",

				bdevname(journal->j_dev, b));

			spin_lock(&journal->j_state_lock);

			journal->j_flags &= ~JFS_BARRIER;

			spin_unlock(&journal->j_state_lock);



			/* And try again, without the barrier */

			set_buffer_uptodate(bh);

			set_buffer_dirty(bh);

			ret = sync_dirty_buffer(bh);

		}

	} else {

	if (journal->j_flags & JFS_BARRIER)

		ret = __sync_dirty_buffer(bh, WRITE_SYNC | WRITE_FLUSH_FUA);

	else

		ret = sync_dirty_buffer(bh);

	}



	put_bh(bh);		/* One for getblk() */

	journal_put_journal_head(descriptor);