From: Al Viro <viro@zeniv•linux.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Nikolay Borisov <nborisov@suse•com>
Subject: Re: linux-next: run time BUG after merge of the vfs-fixes tree?
Date: Fri, 26 Jul 2019 00:31:12 +0100 [thread overview]
Message-ID: <20190725233112.GI1131@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20190725144712.39cb1e5b@canb.auug.org.au>
On Thu, Jul 25, 2019 at 02:47:12PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> During my qemu boot tests (powerpc64 pseries_le_defconfig) today, I got
> the following BUG:
... caused by mismerge. #fixes does
@@ -1471,10 +1470,11 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)
list_add_tail(&p->mnt_child, &p->mnt_parent->mnt_mounts);
} else {
umount_mnt(p);
- hlist_add_head(&p->mnt_umount, &unmounted);
}
}
change_mnt_propagation(p, MS_PRIVATE);
+ if (disconnect)
+ hlist_add_head(&p->mnt_umount, &unmounted);
}
}
and your merge has dropped the removal part - it has
list_add_tail(&p->mnt_child, &p->mnt_parent->mnt_mounts);
} else {
umount_mnt(p);
hlist_add_head(&p->mnt_umount, &unmounted);
}
}
change_mnt_propagation(p, MS_PRIVATE);
if (disconnect)
hlist_add_head(&p->mnt_umount, &unmounted);
}
}
Should've #work.dcache from there once (equal) #work.dcache2 got pulled ;-/
prev parent reply other threads:[~2019-07-25 23:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 4:47 linux-next: run time BUG after merge of the vfs-fixes tree? Stephen Rothwell
2019-07-25 23:31 ` Al Viro [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=20190725233112.GI1131@ZenIV.linux.org.uk \
--to=viro@zeniv$(echo .)linux.org.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nborisov@suse$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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