Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp1275813pxv; Fri, 23 Jul 2021 04:33:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDBl96Q75Wj4n4UjVfBd4rKZt1ecN0VIToECOcPl0MUXXPP463ALfNYBz0VZIe9Z8FwYEJ X-Received: by 2002:a05:6638:2195:: with SMTP id s21mr3818810jaj.15.1627040032503; Fri, 23 Jul 2021 04:33:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627040032; cv=none; d=google.com; s=arc-20160816; b=lpZpzrhpixnadLOaffg7Ge8IuhY/WrOOmVMnSi/YLz+07OV44Q3r2smbsb3Y9QYLPI nUYtbpVmv2QOzuLF0nIaqjR28GitL4VpFn36IhEQ/rTT028nBse+tu8NQ4wjpb7x4pjU FiWIxLlQyzoeOkjC+e5aRlkvDs9J4jU8u7lUZpJNG5SF9FwNis++dZMie6O8hW1TGNo/ U3L5q3RK0v4xpDFHT+ts2ZcOQD5za7FmiOixakqqdF/aAJ/+7kz8Fyb8BHVKXlnwB1bL oozaeQ8aFlkt5UIZHAiogq/+gYugytmz2w8B9KtbuyGISHPHqZ5IEjdW9Gw2SanMrV2e zXZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=+wsnR0dN2X8FM1P7vGJ4mXUYPkQud674fnLf9jaEIc4=; b=sWtPxjQ2czXU0ioLZ7ym6PiY7ky+eJhblJjWNxl//ou0H4SBineQIzJvPFuYGhR7u6 YRXTehXTnO/FA4WlxRWA3dylYTYJ+lgEDcsa7CiuMyckjDrlFsf2A6F+p3d9R4ezm6in +co3ld3+cqBWjewtePN7wpAAH1KEwj/HU2oJ/B8FmhyQbm+oDSC1Ckb2AhcYLefywd1b cyw0Zwa6s3K+aT6VYCql3ngAJtIGUi2nWUw6c2W0Hj7sm7ypZc0XUHllFeWEz+n+vqPp SEK3Llvv3ldxTbf2TfYeRHYvgwDtixAuRdL9mohRA8clUjh4uIkHemBYX8Spqa41cjLG 9ADg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w3si26325315iol.91.2021.07.23.04.33.38; Fri, 23 Jul 2021 04:33:52 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234102AbhGWKw6 (ORCPT + 99 others); Fri, 23 Jul 2021 06:52:58 -0400 Received: from outgoing-auth-1.mit.edu ([18.9.28.11]:56372 "EHLO outgoing.mit.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233315AbhGWKw6 (ORCPT ); Fri, 23 Jul 2021 06:52:58 -0400 Received: from cwcc.thunk.org (pool-72-74-133-215.bstnma.fios.verizon.net [72.74.133.215]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 16NBXOCa017152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jul 2021 07:33:24 -0400 Received: by cwcc.thunk.org (Postfix, from userid 15806) id DD57515C37C0; Fri, 23 Jul 2021 07:33:23 -0400 (EDT) Date: Fri, 23 Jul 2021 07:33:23 -0400 From: "Theodore Ts'o" To: Guoqing Jiang Cc: adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: Re: [PATCH] ext4: remove conflict comment from __ext4_forget Message-ID: References: <20210714055940.1553705-1-guoqing.jiang@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210714055940.1553705-1-guoqing.jiang@linux.dev> Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Wed, Jul 14, 2021 at 01:59:40PM +0800, Guoqing Jiang wrote: > From: Guoqing Jiang > > We do a bforget and return for no journal case, so let's remove this > conflict comment. > > Reviewed-by: Jan Kara > Signed-off-by: Guoqing Jiang Thanks, applied. - Ted