On 4/16/19 10:46 AM, Christoph Hellwig wrote: > s/overflowed/overflow/ in the subject. > > Otherwise this looks good to me: > > Reviewed-by: Christoph Hellwig <[email protected]> > > Although this will create yet another conflict between Linus' tree > and the 5.2 block tree. > > Although maybe Jens still reset the tree and move the merge past this..
That was my main worry too... But I'll probably just deal with it and redo the merge, I don't want to do two, and I don't want to have to deal with answering for why we get repeated conflicts in this area. For the patch, I do generally prefer doing an AND with PAGE_MASK rather than a modulo with PAGE_SIZE. I know the compiler will take care of it, but still, it's more prudent imho. -- Jens Axboe
