From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
NeilBrown <neilb@suse.com>
Subject: Re: linux-next: manual merge of the vfs tree with the overlayfs tree
Date: Thu, 1 Feb 2018 10:25:53 +1100 [thread overview]
Message-ID: <20180201102553.73370fa6@canb.auug.org.au> (raw)
In-Reply-To: <20180125143155.20b15b37@canb.auug.org.au>
Hi all,
On Thu, 25 Jan 2018 14:31:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/dcache.c
>
> between commit:
>
> f9c34674bc60 ("vfs: factor out helpers d_instantiate_anon() and d_alloc_anon()")
>
> from the overlayfs tree and commit:
>
> f1ee616214cb ("VFS: don't keep disconnected dentries on d_anon")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/dcache.c
> index 99bce0ed0213,17e6b84b9656..000000000000
> --- a/fs/dcache.c
> +++ b/fs/dcache.c
> @@@ -1954,16 -1961,18 +1953,18 @@@ static struct dentry *__d_instantiate_a
> if (disconnected)
> add_flags |= DCACHE_DISCONNECTED;
>
> - spin_lock(&tmp->d_lock);
> - __d_set_inode_and_type(tmp, inode, add_flags);
> - hlist_add_head(&tmp->d_u.d_alias, &inode->i_dentry);
> + spin_lock(&dentry->d_lock);
> + __d_set_inode_and_type(dentry, inode, add_flags);
> + hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
> - hlist_bl_lock(&dentry->d_sb->s_anon);
> - hlist_bl_add_head(&dentry->d_hash, &dentry->d_sb->s_anon);
> - hlist_bl_unlock(&dentry->d_sb->s_anon);
> + if (!disconnected) {
> - hlist_bl_lock(&tmp->d_sb->s_roots);
> - hlist_bl_add_head(&tmp->d_hash, &tmp->d_sb->s_roots);
> - hlist_bl_unlock(&tmp->d_sb->s_roots);
> ++ hlist_bl_lock(&dentry->d_sb->s_roots);
> ++ hlist_bl_add_head(&dentry->d_hash, &tmp->d_sb->s_roots);
> ++ hlist_bl_unlock(&dentry->d_sb->s_roots);
> + }
> - spin_unlock(&tmp->d_lock);
> + spin_unlock(&dentry->d_lock);
> spin_unlock(&inode->i_lock);
>
> - return tmp;
> + return dentry;
>
> out_iput:
> iput(inode);
This is now a conflict between the overlayfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2018-01-31 23:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-25 3:31 linux-next: manual merge of the vfs tree with the overlayfs tree Stephen Rothwell
2018-01-25 3:39 ` Stephen Rothwell
2018-01-31 23:25 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-12 2:03 Stephen Rothwell
2018-07-10 0:22 Stephen Rothwell
2018-07-10 0:17 Stephen Rothwell
2018-07-10 15:04 ` Al Viro
2018-07-11 2:11 ` Al Viro
2018-06-19 1:21 Stephen Rothwell
2018-06-19 8:40 ` David Howells
2018-06-19 13:38 ` Miklos Szeredi
2018-06-19 1:10 Stephen Rothwell
2018-05-29 1:30 Stephen Rothwell
2018-06-05 0:19 ` Stephen Rothwell
2018-06-18 3:43 ` Stephen Rothwell
2017-11-08 23:18 Stephen Rothwell
2016-12-11 23:13 Stephen Rothwell
2016-12-11 23:08 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-07-25 0:24 Stephen Rothwell
2016-07-25 0:30 ` Al Viro
2016-07-25 8:09 ` Miklos Szeredi
2016-05-10 23:20 Stephen Rothwell
2016-05-02 0:59 Stephen Rothwell
2016-05-02 1:08 ` Al Viro
2016-05-02 1:23 ` Al Viro
2016-05-02 8:30 ` Miklos Szeredi
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=20180201102553.73370fa6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=neilb@suse.com \
--cc=viro@ZenIV.linux.org.uk \
/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).