On Tue, Jun 21, 2016 at 08:36:49AM +0800, Qu Wenruo wrote: > > I'm looking how well does this patchset merges with the rest, so far > > there are excpected conflicts with Chandan's subpage-blocksize > > patchset. For the easy parts, we can add stub patches to extend > > functions like cow_file_range with parameters that are added by the > > other patch. > > > > Honestly I don't know which patchset to take first. As the > > subpage-blockszie is in the core, there are no user visibility and > > interface questions, but it must not cause any regressions. > > > > Dedupe is optional, not default, and we have to mainly make sure it does > > not have any impact when turned off. > > > > So I see three possible ways: > > > > * merge subpage first, as it defines the API, adapt dedupe > > Personally, I'd like to merge subpage first. > > AFAIK, it's more important than dedupe. > It affects whether a fs created in 64K page size environment can be > mounted on a 4K page size system.
Yeah, but I'm now concerned about the way both will be integrated in the development or preview branches, not really the functionality itself. Now the conflicts are not trivial, so this takes extra time on my side and I can't be sure about the result in the end if I put only minor efforts to resolve the conflicts ("make it compile"). And I don't want to do that too often. As stated in past discussions, the features of this impact should spend one development cycle in for-next, even if it's not ready for merge or there are reviews going on. The subpage patchset is now in a relatively good shape to start actual testing, which already revealed some problems. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html