Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp884267pxb; Sat, 9 Jan 2021 00:02:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDjc9QukaCsbH3zPVjvwlxxWewL1R75gF90m+0du+/V90YRKI1ACRy5LZscFUXkLChZPTS X-Received: by 2002:a50:c3c5:: with SMTP id i5mr7847234edf.166.1610179323809; Sat, 09 Jan 2021 00:02:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610179323; cv=none; d=google.com; s=arc-20160816; b=kdmSTvvzCLuhsUJYhOwMNvI7zx86ZosfClsJPiEAWqhqqZ6aVzCbUYZ5A/+lsq3f5T F2eDKCRRDHgVjmgH7560YYY6Xskab38gk88lnA5u97hqjhtew0j1Uh63MwaQ43ZzJem4 gUBbh3KtQ7OibjJHVaoZSk7ht0wqZmldU2wsmX1kiy6Fxfo20kHXFDNBp2G1FC7ReYkW FIvFmKvVsm+9845JvAeGbETSJQEnxl6bRuWxL5jU6NHq+e+u35/dBokfAZkK3C3QV9i2 ckIX4XNI8gXTDjXzGV2nLNYdsj3+pp7vgHZjAR0B5ytIntjGZLbVz2TfM0D9DHJwFP6T 1lhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E9RZGHJ3iRzLVgflzlgZdLefnE9lEKxMIUC8T/dWH40=; b=kGf3G1zuZSOK8/ggnZiaqhU3mXyRbQHkcq5dgbNSA5jfoTVviE1EAZiidm0ANsaATG dfRaaOCbOjggPlIfgUxJrITJPjahaYd9He8pJt1QK/bg8UqFvd4rb/SWyJaOMpaf9r4y asTRAxhy0QKt3q9nrqbUCMEtRLgrjbvJWBHiNkpJOb7i3FM02hcUlYl6it1qDx2vZYWo MezEQuYcMyp1l35ufHQ8ql9PAg2LX2rjEoVWDjpFmrjav79cXz0hxfSkXL1zXU1N4HeX UX4/AMVUDz2MUuD8dcLxgbMpw7LnBSjdHpXZMXe9AwkKEepr35DJR/dTEIRu9sOjKbUA mWAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TiFXWSyf; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pk26si4175371ejb.584.2021.01.09.00.01.40; Sat, 09 Jan 2021 00:02:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TiFXWSyf; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbhAIIBG (ORCPT + 99 others); Sat, 9 Jan 2021 03:01:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:41208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726742AbhAIIBF (ORCPT ); Sat, 9 Jan 2021 03:01:05 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48D5023A79; Sat, 9 Jan 2021 07:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610179186; bh=HlkfW2Zd+8gbGgRYWpPKUKO7Wsu0D0Ym2jm7ngGDK6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TiFXWSyfmbsN3BDcG7PKa2lenBUufiTlI+s5eLmHeooUDodCaYvgbrC0t8ZxpN/zN JbsWlpl0uq3xkj5uqtZv+Bo4odDb3qTVPjpPtDmhmn5Wd7nmW3THFhIGqFy82BMiGx tp9i8kbwvNKQviYzrZG0WbLWcr5XJbqWSAXXjQI5TJr7DmZT9dJgYsscxWr94zZu1U 29llfMrMr/uxGRdZ2bUSuC0QnTZLXzMy4tbITGOnHX9r67IwEncVqVlvh887GdAWF9 1Joi3ciGc+t2Xqd3h4Ez1iZELXUZYaXEfHjEQS13fBBYIrW/L91+G0qYr3wVEK2oYu c0nd4I5Kgqq7A== From: Eric Biggers To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Theodore Ts'o , Christoph Hellwig Subject: [PATCH v2 08/12] fs: drop redundant check from __writeback_single_inode() Date: Fri, 8 Jan 2021 23:58:59 -0800 Message-Id: <20210109075903.208222-9-ebiggers@kernel.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210109075903.208222-1-ebiggers@kernel.org> References: <20210109075903.208222-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers wbc->for_sync implies wbc->sync_mode == WB_SYNC_ALL, so there's no need to check for both. Just check for WB_SYNC_ALL. Signed-off-by: Eric Biggers --- fs/fs-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 80ee9816d9df5..cee1df6e3bd43 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1479,7 +1479,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc) * change I_DIRTY_TIME into I_DIRTY_SYNC. */ if ((inode->i_state & I_DIRTY_TIME) && - (wbc->sync_mode == WB_SYNC_ALL || wbc->for_sync || + (wbc->sync_mode == WB_SYNC_ALL || time_after(jiffies, inode->dirtied_time_when + dirtytime_expire_interval * HZ))) { trace_writeback_lazytime(inode); -- 2.30.0