A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-linus

Browse source 
Conflicts:
	block/Kconfig

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2010-03-19 08:05:10 +01:00
commit b4b7a4ef09
1756 changed files with 63811 additions and 49229 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fs/bio.c
View file

@ -264,13 +264,12 @@ EXPORT_SYMBOL(bio_init);
* bio_alloc_bioset - allocate a bio for I/O
* @gfp_mask: the GFP_ mask given to the slab allocator
* @nr_iovecs: number of iovecs to pre-allocate
* @bs: the bio_set to allocate from. If %NULL, just use kmalloc
* @bs: the bio_set to allocate from.
*
* Description:
* bio_alloc_bioset will first try its own mempool to satisfy the allocation.
* bio_alloc_bioset will try its own mempool to satisfy the allocation.
* If %__GFP_WAIT is set then we will block on the internal pool waiting
* for a &struct bio to become free. If a %NULL @bs is passed in, we will
* fall back to just using @kmalloc to allocate the required memory.
* for a &struct bio to become free.
*
* Note that the caller must set ->bi_destructor on successful return
* of a bio, to do the appropriate freeing of the bio once the reference