diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/bio.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console (diff) | |
| parent | doc: fix typo in comment explaining rb_tree usage (diff) | |
| download | linux-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.xz linux-318ae2edc3b29216abd8a2510f3f80b764f06858.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 |