linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>, 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: Re: linux-next: manual merge of the vfs tree with the f2fs tree
Date: Wed, 20 Dec 2023 04:44:42 +0000	[thread overview]
Message-ID: <20231220044442.GX1674809@ZenIV> (raw)
In-Reply-To: <20231220140529.3979085c@canb.auug.org.au>

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...

  reply	other threads:[~2023-12-20  4:44 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-19 23:47 linux-next: manual merge of the vfs tree with the f2fs tree Stephen Rothwell
2023-12-20  0:13 ` Stephen Rothwell
2023-12-20  1:34   ` Al Viro
2023-12-20  3:05     ` Stephen Rothwell
2023-12-20  4:44       ` Al Viro [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-19  0:53 Stephen Rothwell
2018-10-03  0:12 Stephen Rothwell
2017-11-08 23:06 Stephen Rothwell
2017-11-08 23:01 Stephen Rothwell
2017-02-27  0:05 Stephen Rothwell
2017-02-27  8:27 ` David Howells
2016-07-25  0:21 Stephen Rothwell
2016-05-03  1:41 Stephen Rothwell
2015-05-07  2:05 Stephen Rothwell
2015-04-13  1:53 Stephen Rothwell
2014-06-10  1:23 Stephen Rothwell
2014-04-29  0:37 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231220044442.GX1674809@ZenIV \
    --to=viro@zeniv.linux.org.uk \
    --cc=chao@kernel.org \
    --cc=jack@suse.cz \
    --cc=jaegeuk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).