From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mateusz Guzik <mguzik@redhat.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
linux-fsdevel@vger.kernel.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Theodore Ts'o <tytso@mit.edu>,
Miklos Szeredi <mszeredi@redhat.com>
Subject: Re: linux-next: Tree for May 2 [WARNING: at fs/dcache.c]
Date: Mon, 2 May 2016 22:15:39 +0900 [thread overview]
Message-ID: <20160502131539.GA626@swordfish> (raw)
In-Reply-To: <20160502220745.44c4bd91@canb.auug.org.au>
On (05/02/16 22:07), Stephen Rothwell wrote:
[..]
> > The issue is that 2 macros have the same value:
> >
> > #define DCACHE_OP_REAL 0x08000000
> >
> > #define DCACHE_PAR_LOOKUP 0x08000000 /* being looked up
> > (with parent locked shared) */
> >
> > Verified with switching one to 0x10000000 and the warning went away.
>
> This comes from a bad automatic merge resolution between commit
>
> d101a125954e ("fs: add file_dentry()")
>
> from Linus' tree (introduced before v4.5-rc3) and commit
>
> 340450a54573 ("beginning of transition to parallel lookups - marking in-lookup dentries")
>
> from the vfs tree.
>
> I will fix this up in tomorrow's tree (unless Al beats me to it).
good find, Mateusz.
thanks to both of you.
-ss
prev parent reply other threads:[~2016-05-02 12:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 8:40 linux-next: Tree for May 2 Stephen Rothwell
2016-05-02 10:15 ` linux-next: Tree for May 2 [WARNING: at fs/dcache.c] Sergey Senozhatsky
2016-05-02 10:33 ` Mateusz Guzik
2016-05-02 12:07 ` Stephen Rothwell
2016-05-02 12:35 ` Stephen Rothwell
2016-05-02 13:15 ` Sergey Senozhatsky [this message]
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=20160502131539.GA626@swordfish \
--to=sergey.senozhatsky@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mguzik@redhat.com \
--cc=mszeredi@redhat.com \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.