From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FBEFC282CE for ; Mon, 11 Feb 2019 15:47:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D192A21855 for ; Mon, 11 Feb 2019 15:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549900068; bh=2cZW44OKdeBHD9tJLSk5XCJUTECC9u5Eq+MDk7KhD5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bvs1Oz0dDFqe1rqYh/rQMM9f6LbczQuTlt+A0o83zn35JW/r24XA5ucD4yqHIhByA 2H12pYhger6kuoowXGPj1K57Sh1VEnkmQPbIvPvo9CMho2eRwKtaMPJ6QdVR1r2HzV rm5qgmrzxNa6AT9V4X5vcSD6vL6agOEIFKMI0/jI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729258AbfBKPrn (ORCPT ); Mon, 11 Feb 2019 10:47:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:52616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731787AbfBKOlV (ORCPT ); Mon, 11 Feb 2019 09:41:21 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2C1DE20700; Mon, 11 Feb 2019 14:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896080; bh=2cZW44OKdeBHD9tJLSk5XCJUTECC9u5Eq+MDk7KhD5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bf20abCrzi8S+L63G8XkzQwPg6gh5EqZLYmWH22Z/bz0Sx6cpX7VCkLHktsWPjXWF OCIwd7iIFRn1dHCBa3ffGHvr0Libxi/tyJoibIz4Dnm0TEUhcB6RnnDTbIMugxxF1/ crXTMgxre9rVafDX//gyHXGgxYWi7Ht3MkLHWkHs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunlei He , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 067/313] f2fs: move dir data flush to write checkpoint process Date: Mon, 11 Feb 2019 15:15:47 +0100 Message-Id: <20190211141858.338606130@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ] This patch move dir data flush to write checkpoint process, by doing this, it may reduce some time for dir fsync. pre: -f2fs_do_sync_file enter -file_write_and_wait_range <- flush & wait -write_checkpoint -do_checkpoint <- wait all -f2fs_do_sync_file exit now: -f2fs_do_sync_file enter -write_checkpoint -block_operations <- flush dir & no wait -do_checkpoint <- wait all -f2fs_do_sync_file exit Signed-off-by: Yunlei He Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 5474aaa274b9..fd36aa6569dc 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -220,6 +220,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, trace_f2fs_sync_file_enter(inode); + if (S_ISDIR(inode->i_mode)) + goto go_write; + /* if fdatasync is triggered, let's do in-place-update */ if (datasync || get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks) set_inode_flag(inode, FI_NEED_IPU); -- 2.19.1