On 3/27/19 9:50 PM, Ming Lei wrote: > bio_add_page() and __bio_add_page() are capable of adding pages into > bio, and now we have at least two such usages alreay: > > - __bio_iov_bvec_add_pages() > - nvmet_bdev_execute_rw(). > > So update comments on these two helpers. > > The thing is a bit special for __bio_try_merge_page(), given the caller > needs to know if the new added page is same with the last added page, > then it isn't safe to pass multi-page in case that 'same_page' is true, > so adds warning on potential misuse, and updates comment on > __bio_try_merge_page(). This is going to create a needless conflict between 5.1 and the 5.2 block tree. I haven't pushed the 5.2 tree out yet, plan to do so this week after I've pushed the current 5.1 patches. Can you respin this one on top of for-5.2/block when it comes out? -- Jens Axboe
