On Wed, Aug 08, 2012 at 09:20:59AM -0600, David Sterba wrote: > On Sat, Aug 04, 2012 at 01:39:25AM +0200, Alexander Block wrote: > > On Fri, Aug 3, 2012 at 11:13 PM, Josef Bacik <jbacik@xxxxxxxxxxxx> wrote: > > > I'm confused, this isn't here in btrfs-next, so is this a problem still? > > > > It's in linus current master. Lio Bo moved the call out of > > btrfs_mksubvol into the caller. Later a commit from Jan Kara tried to > > move the call inside mksubvol below i_mutex. If I understand the logs > > correctly, It was then merged incorrectly. > > How should we resolve this? The patch has to be pulled via a separate > branch, based on top of linus/master, as cmason/for-linus does not have > the clashing freezer patches. And I do want to see the fix in master > rather soon as it makes testing tedious. Right, I'll fix this up in a separate send to Linus. I thought I had this fixed in my original merge, but either way I'll send a pull to fix it. -chris -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
