From patchwork Fri Jun 6 19:51:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 357006 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 66EC51400A0 for ; Sat, 7 Jun 2014 05:52:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752020AbaFFTvw (ORCPT ); Fri, 6 Jun 2014 15:51:52 -0400 Received: from mail-ob0-f202.google.com ([209.85.214.202]:33112 "EHLO mail-ob0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbaFFTvv (ORCPT ); Fri, 6 Jun 2014 15:51:51 -0400 Received: by mail-ob0-f202.google.com with SMTP id wm4so689894obc.5 for ; Fri, 06 Jun 2014 12:51:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:cc:from:date:mime-version :content-type:content-transfer-encoding:message-id; bh=l+0e98y21EPKPjGgZHzL8Cw9hm/QXegdQkIAk4vGn0A=; b=SnVMpv2lH0M+/wTnaAbQXDEDM9cadLmjQTFj3TRi+jvHJEoKfeO03sSUzZPLFkmcIh BAwCdYmcyjHzbGZ2JLMtyJc3if4Ukyf1lDIOUSuXufyGdCn0OgzYBYPPWmf/WTxXuVf1 wNodT6SWNB0Uzg3G7fM0wRoEDEZ5lhWV3U1GwVzMDGCgOF6MTD6EgILArE+0ukuauQlV IGdjwc67yT9AqSVDyKeALtGNrSdTaWUfyL/oUn/l10udOipIhM2X0/5COKFswzH+1PXy jCVNfgFjGdXa/hRlfd6v5LIvgrTW4UW27pRNHCdtbEl2/tbuA5Hp0SHkjtukU9rkXHJ5 HftQ== X-Gm-Message-State: ALoCoQlGN58nljzP9LxviYfBsDJKZviJQdMGwl0ZgsRhH0Co+/81evYTT43vLi44px38Rd5bxlb4 X-Received: by 10.50.239.196 with SMTP id vu4mr3542244igc.8.1402084311195; Fri, 06 Jun 2014 12:51:51 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id ds6si708614vdb.0.2014.06.06.12.51.51 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jun 2014 12:51:51 -0700 (PDT) Received: from localhost.localdomain (akpm3.mtv.corp.google.com [172.17.131.127]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 728635A45DE; Fri, 6 Jun 2014 12:51:50 -0700 (PDT) Subject: [patch 1/1] fs/ext4/fsync.c: generic_file_fsync call based on barrier flag To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, akpm@linux-foundation.org, fabf@skynet.be, hch@infradead.org, jack@suse.cz, viro@zeniv.linux.org.uk From: akpm@linux-foundation.org Date: Fri, 06 Jun 2014 12:51:50 -0700 MIME-Version: 1.0 Message-Id: <20140606195150.728635A45DE@corp2gmr1-2.hot.corp.google.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Fabian Frederick Subject: fs/ext4/fsync.c: generic_file_fsync call based on barrier flag generic_file_fsync has been updated to issue a flush for older filesystems. This patch tests for barrier flag in ext4 mount flags and calls the right function. Signed-off-by: Fabian Frederick Suggested-by: Jan Kara Suggested-by: Christoph Hellwig Cc: Jan Kara Cc: Christoph Hellwig Cc: Alexander Viro Cc: "Theodore Ts'o" Signed-off-by: Andrew Morton Reviewed-by: Lukas Czerner --- fs/ext4/fsync.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN fs/ext4/fsync.c~fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag fs/ext4/fsync.c --- a/fs/ext4/fsync.c~fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag +++ a/fs/ext4/fsync.c @@ -107,7 +107,10 @@ int ext4_sync_file(struct file *file, lo } if (!journal) { - ret = generic_file_fsync(file, start, end, datasync); + if (test_opt(inode->i_sb, BARRIER)) + ret = generic_file_fsync(file, start, end, datasync); + else + ret = __generic_file_fsync(file, start, end, datasync); if (!ret && !hlist_empty(&inode->i_dentry)) ret = ext4_sync_parent(inode); goto out;