From: Eric Sandeen Subject: Re: [PATCH] ext4: respect the nobarrier mount option in nojournal mode Date: Tue, 7 Jun 2016 22:23:10 -0500 Message-ID: <8421f4bf-a49c-572c-c8db-29709a17eee6@redhat.com> References: <1465354031-15429-1-git-send-email-tytso@mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit To: "Theodore Ts'o" , Ext4 Developers List Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59099 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161052AbcFHDXS (ORCPT ); Tue, 7 Jun 2016 23:23:18 -0400 In-Reply-To: <1465354031-15429-1-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: On 6/7/16 9:47 PM, Theodore Ts'o wrote: > Also, if we are going to issue the barrier, we should do this after we > write out the parent directories if necessary. > > Signed-off-by: Theodore Ts'o > --- > fs/ext4/fsync.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c > index 8850254..011863e 100644 > --- a/fs/ext4/fsync.c > +++ b/fs/ext4/fsync.c > @@ -106,9 +106,11 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) > } > > if (!journal) { > - ret = generic_file_fsync(file, start, end, datasync); > + ret = __generic_file_fsync(file, start, end, datasync); > if (!ret && !hlist_empty(&inode->i_dentry)) > ret = ext4_sync_parent(inode); > + if (journal->j_flags & JBD2_BARRIER) > + goto issue_flush; So in the "if (!journal)" case you test journal->j_flags? Confused... -Eric > goto out; > } > > @@ -140,6 +142,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) > needs_barrier = true; > ret = jbd2_complete_transaction(journal, commit_tid); > if (needs_barrier) { > + issue_flush: > err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL); > if (!ret) > ret = err; >