Message ID | 20231220104734.0979a9f8@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2307626dyi; Tue, 19 Dec 2023 15:47:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRcLnXHS1EZqRg+UBqCpwgPJ1Cohr5SMfG5KBxN6X94G3gY6Pgm/bDxUdJ3xgDMr4p67rc X-Received: by 2002:a2e:b0c8:0:b0:2cc:8735:4edb with SMTP id g8-20020a2eb0c8000000b002cc87354edbmr621407ljl.20.1703029676732; Tue, 19 Dec 2023 15:47:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703029676; cv=none; d=google.com; s=arc-20160816; b=bZaICV2WqgoKMUC/CeCEI2v3+0tE2sYiFt76z5PtA3Rz/0fbHugCElig+8zC5e81vJ HQG0+Ry8gJZA5InhD8xxRZAYV87dGj51HbltzG8cP8zhmm9Qc4qan36z6QbMgI5/z/VH mCY/jTUzhTRITLrR4nz06YmDdclDk7BnYJx9RdRFUvw9e7wScD3Q8axtFfyUrJQp7vOu vcXEqlwpHGNQcdoq1/to2FRL2ypnMR4ZyZ/DO4V0mynhlxBAesjVGenCw2r5zXtBRGcZ HxWsyZcCfMcjVRjoNv7XgoFNMQTF+ya2s44bhQG+FLP/Xq3r/RopuQOc0HdeqoeUlJw3 NeZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=yG7epzk7fodBt427P9omimt0DRcleEmV5g9hp/dhs9Q=; fh=iPjy/O44Iqc+kiFNNeOe/bIpoVswN+gEw8gWzHmRp1g=; b=yiVfGV0i4jvw7p5Vn3LZvJ+r53cGIklnPq7CHBCmUqOdZZx0VvbZsNm4HQtHmLEBXf /52VVa1AVXGsV3PEuN4dxS9WD+nzr+eBYXZvDRrYSJ9BSAf/5lYh0YH2a9q0s6KOuH+C GR5FXEHyqe2cpJGF4haGY3GwZ+9PgOVKsjFdsVweUpyT9ecAeN8RCGBplsdtFkt4BPLU 8gVfE8DdcvDyqCzIg9zlIcHFG0a3SKtzkxpqbo2b7vlONBBoh9UU9jx9v2VKJydywDws nOAnfghiS66+cxxbgiWors2ylkgZObo47VCYiYWxNYhHxZvB5Ip/IyNOvrR7As73L+Qa H5Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WyRKwk0t; spf=pass (google.com: domain of linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id t14-20020a056402524e00b00553a2b5acb0si835360edd.435.2023.12.19.15.47.56 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 15:47:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WyRKwk0t; spf=pass (google.com: domain of linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6110-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 559221F23597 for <ouuuleilei@gmail.com>; Tue, 19 Dec 2023 23:47:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D6C85405C6; Tue, 19 Dec 2023 23:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="WyRKwk0t" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B15143EA7D; Tue, 19 Dec 2023 23:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1703029656; bh=yG7epzk7fodBt427P9omimt0DRcleEmV5g9hp/dhs9Q=; h=Date:From:To:Cc:Subject:From; b=WyRKwk0tYsa/jB71M+fNNx5RKP1TTRuAkQIP7opN2wHz4/uhIg/skV7yR5/QgalI2 9ZZ4x+bPfV1zgpuPPM7UBU7qfLI9cr0lhR9bjxsC4aQiV28m2X4kuBnpeyrsdmmxeo L/QVc4hJXI3a4+HPadNtMNFBbyUynru8c6dZCghe9VFFjXjiQCiG1C+4FfcdTBsWJt pnJqw+32uwZ1x7tLvLp+r44aAKma885Ye801DVdAM8/CQP+6xanavIZlH+6xAjboUb n3xzTGMTgKJgC66RxvN7tUoktLLZdGzBwxwhdUpFdMShj50X5KvGp2tNkqyS9UFdEE J7Bvt8ZJH4eew== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SvtfH2JjLz4wd4; Wed, 20 Dec 2023 10:47:35 +1100 (AEDT) Date: Wed, 20 Dec 2023 10:47:34 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Al Viro <viro@ZenIV.linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel.org> Cc: Chao Yu <chao@kernel.org>, Jan Kara <jack@suse.cz>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the vfs tree with the f2fs tree Message-ID: <20231220104734.0979a9f8@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5=M40P7dLA5C/mRQPI=9M=u"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785756046360354611 X-GMAIL-MSGID: 1785756046360354611 |
Series |
linux-next: manual merge of the vfs tree with the f2fs tree
|
|
Commit Message
Stephen Rothwell
Dec. 19, 2023, 11:47 p.m. UTC
Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/f2fs/namei.c between commit: 53edb549565f ("f2fs: fix to avoid dirent corruption") from the f2fs tree and commit: 7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not change") from the vfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Comments
Hi Al, On Wed, 20 Dec 2023 10:47:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/f2fs/namei.c > > between commit: > > 53edb549565f ("f2fs: fix to avoid dirent corruption") > > from the f2fs tree and commit: > > 7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not change") > > from the vfs tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Then I remembered to look at your suggested resolution and redid it like you did (see below).
On Wed, Dec 20, 2023 at 11:13:25AM +1100, Stephen Rothwell wrote: > Hi Al, > > On Wed, 20 Dec 2023 10:47:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Today's linux-next merge of the vfs tree got a conflict in: > > > > fs/f2fs/namei.c > > > > between commit: > > > > 53edb549565f ("f2fs: fix to avoid dirent corruption") > > > > from the f2fs tree and commit: > > > > 7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not change") > > > > from the vfs tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > Then I remembered to look at your suggested resolution and redid it > like you did (see below). My suggested resolution had been wrong, actually - the way it's written, link count drop should be conditional on old_is_dir, cross-directory or not. I think the right solution is if (old_dir_entry) f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir); if (old_is_dir) f2fs_i_links_write(old_dir, false);
Hi Al, On Wed, 20 Dec 2023 01:34:02 +0000 Al Viro <viro@zeniv.linux.org.uk> wrote: > > My suggested resolution had been wrong, actually - the way it's written, > link count drop should be conditional on old_is_dir, cross-directory or > not. > > I think the right solution is > if (old_dir_entry) > f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir); > if (old_is_dir) > f2fs_i_links_write(old_dir, false); Ok, I will fix it up.
On Wed, Dec 20, 2023 at 02:05:29PM +1100, Stephen Rothwell wrote: > Hi Al, > > On Wed, 20 Dec 2023 01:34:02 +0000 Al Viro <viro@zeniv.linux.org.uk> wrote: > > > > My suggested resolution had been wrong, actually - the way it's written, > > link count drop should be conditional on old_is_dir, cross-directory or > > not. > > > > I think the right solution is > > if (old_dir_entry) > > f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir); > > if (old_is_dir) > > f2fs_i_links_write(old_dir, false); > > Ok, I will fix it up. Backmerge with conflict resolution added to #for-next...
diff --cc fs/f2fs/namei.c index ede6afb81762,fdc97df6bb85..000000000000 --- a/fs/f2fs/namei.c