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.1 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=ham 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 B15A3C43381 for ; Mon, 18 Feb 2019 14:08:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CA7021916 for ; Mon, 18 Feb 2019 14:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498905; bh=wU4C1BsAlChsnviTPnRn+XxYedNyikCZiOpUCrWAsAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q1O02+mdTkXzaRgz3nb6b3TcezY/ZWScdNLOnB0UK4bBtEduZun4jPG6Xo9968fmj 1J53UkZm3G9EngbtgWHPMuxx0Gbe1yjTNa2c00kZSsAMGWNhHrpuLVBHSbxGUIUM3J KhpYAzkf6lieIBdMbNG7B8GXJjr3rZYh+YQin9D0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390904AbfBROIX (ORCPT ); Mon, 18 Feb 2019 09:08:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:51634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390562AbfBROIU (ORCPT ); Mon, 18 Feb 2019 09:08:20 -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 D213B21917; Mon, 18 Feb 2019 14:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498900; bh=wU4C1BsAlChsnviTPnRn+XxYedNyikCZiOpUCrWAsAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VRAavL0let1sENAjWuhnpKbG59mThGKQCsjAZdXRMw61jfgVhqT9IS/yGK+j7eBMK 6sJmzQzEeZWDv3C6nNWlbp3bQD9GUIv7O9SBLcJgiVttz3O288BDxdM7HcOi7v6CTE s6OsYa5K73/gV7BS9/rF/ZJDhIFoDzHcPMXH1FKo= 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 3.18 013/108] f2fs: move dir data flush to write checkpoint process Date: Mon, 18 Feb 2019 14:43:09 +0100 Message-Id: <20190218133520.120476263@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-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 8e68bb64f835..c4ba75acc6e2 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -153,6 +153,9 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 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 (get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks) set_inode_flag(fi, FI_NEED_IPU); -- 2.19.1