take bio.h out of highmem.h
Subsystems (9)
PATCH 13/19 take bio.h out of highmem.h
highmem.h includes bio.h, so just about every compilation unit in the kernel gets to process bio.h.
The patch moves the BIO-related functions out of highmem.h and into bio-related headers. The nested include is removed and all files which need to include bio.h now do so.
fs/bio.c renamed from fs/bio.c~cleanup-highmem-no-bio +1 -0
@@ -17,6 +17,7 @@* */ #include <linux/mm.h> +#include <linux/bio.h> #include <linux/blk.h> #include <linux/slab.h> #include <linux/iobuf.h>
include/linux/highmem.h renamed from include/linux/highmem.h~cleanup-highmem-no-bio +0 -44
64 lines not on this page · raw message
include/linux/bio.h renamed from include/linux/bio.h~cleanup-highmem-no-bio +47 -3
66 lines not on this page · raw message
include/linux/buffer_head.h renamed from include/linux/buffer_head.h~cleanup-highmem-no-bio +0 -5
@@ -106,12 +106,7 @@ BUFFER_FNS(Async_Read, async_read) BUFFER_FNS(Async_Write, async_write) BUFFER_FNS(Boundary, boundary) -/* -* FIXME: this is used only by bh_kmap, which is used only by RAID5. -* Move all that stuff into raid5.c - */#define bh_offset (bh) ((unsigned long)(bh)->b_data & ~PAGE_MASK) -#define touch_buffer (bh) mark_page_accessed(bh->b_page)/* If we *know* page->private refers to buffer_heads */
include/linux/blkdev.h renamed from include/linux/blkdev.h~cleanup-highmem-no-bio +1 -6
@@ -246,12 +246,7 @@ extern unsigned long blk_max_low_pfn, bl#define BLK_BOUNCE_ISA (ISA_DMA_THRESHOLD)extern int init_emergency_isa_pool (void ); -extern void create_bounce (unsigned long pfn,int gfp,struct bio **bio_orig); - -extern inline void blk_queue_bounce (request_queue_t *q,struct bio **bio) -{ -create_bounce (q->bounce_pfn, q->bounce_gfp, bio); -} +void blk_queue_bounce (request_queue_t *q,struct bio **bio);#define rq_for_each_bio (bio, rq) \ if ((rq->bio)) \
kernel/ksyms.c renamed from kernel/ksyms.c~cleanup-highmem-no-bio +1 -1
@@ -120,7 +120,7 @@ EXPORT_SYMBOL(vmtruncate);EXPORT_SYMBOL (find_vma);EXPORT_SYMBOL (get_unmapped_area);EXPORT_SYMBOL (init_mm); -EXPORT_SYMBOL (create_bounce); +EXPORT_SYMBOL (blk_queue_bounce);#ifdef CONFIG_HIGHMEM EXPORT_SYMBOL (kmap_high);EXPORT_SYMBOL (kunmap_high);
mm/highmem.c renamed from mm/highmem.c~cleanup-highmem-no-bio +4 -1
@@ -17,6 +17,7 @@*/ #include <linux/mm.h> +#include <linux/bio.h> #include <linux/pagemap.h> #include <linux/mempool.h> #include <linux/blkdev.h>
@@ -347,13 +348,15 @@ static void bounce_end_io_read_isa(strucreturn __bounce_end_io_read (bio, isa_page_pool); } -void create_bounce (unsigned long pfn,int gfp,struct bio **bio_orig) +void blk_queue_bounce (request_queue_t *q,struct bio **bio_orig) {struct page *page;struct bio *bio =NULL ;int i, rw =bio_data_dir (*bio_orig), bio_gfp;struct bio_vec *to, *from;mempool_t *pool; +unsigned long pfn = q->bounce_pfn; +int gfp = q->bounce_gfp;BUG_ON ((*bio_orig)->bi_idx);
drivers/block/elevator.c renamed from drivers/block/elevator.c~cleanup-highmem-no-bio +1 -0
@@ -28,6 +28,7 @@#include <linux/fs.h> #include <linux/blkdev.h> #include <linux/elevator.h> +#include <linux/bio.h> #include <linux/blk.h> #include <linux/config.h> #include <linux/module.h>
drivers/block/ll_rw_blk.c renamed from drivers/block/ll_rw_blk.c~cleanup-highmem-no-bio +1 -0
@@ -18,6 +18,7 @@#include <linux/errno.h> #include <linux/string.h> #include <linux/config.h> +#include <linux/bio.h> #include <linux/mm.h> #include <linux/swap.h> #include <linux/init.h>
drivers/block/floppy.c renamed from drivers/block/floppy.c~cleanup-highmem-no-bio +1 -0
@@ -165,6 +165,7 @@ static int print_unex=1;#include <linux/errno.h> #include <linux/slab.h> #include <linux/mm.h> +#include <linux/bio.h> #include <linux/string.h> #include <linux/fcntl.h> #include <linux/delay.h>
drivers/block/loop.c renamed from drivers/block/loop.c~cleanup-highmem-no-bio +1 -0
@@ -60,6 +60,7 @@#include <linux/sched.h> #include <linux/fs.h> #include <linux/file.h> +#include <linux/bio.h> #include <linux/stat.h> #include <linux/errno.h> #include <linux/major.h>
include/linux/ide.h renamed from include/linux/ide.h~cleanup-highmem-no-bio +1 -0
@@ -15,6 +15,7 @@#include <linux/devfs_fs_kernel.h> #include <linux/interrupt.h> #include <linux/bitops.h> +#include <linux/bio.h> #include <asm/byteorder.h> #include <asm/hdreg.h>
drivers/block/rd.c renamed from drivers/block/rd.c~cleanup-highmem-no-bio +2 -0
@@ -45,6 +45,8 @@#include <linux/config.h> #include <linux/string.h> #include <linux/slab.h> +#include <asm/atomic.h> +#include <linux/bio.h> #include <linux/module.h> #include <linux/init.h> #include <linux/devfs_fs_kernel.h>
drivers/md/linear.c renamed from drivers/md/linear.c~cleanup-highmem-no-bio +1 -1
@@ -20,7 +20,7 @@#include <linux/raid/md.h> #include <linux/slab.h> - +#include <linux/bio.h> #include <linux/raid/linear.h> #define MAJOR_NR MD_MAJOR
drivers/md/raid0.c renamed from drivers/md/raid0.c~cleanup-highmem-no-bio +1 -0
@@ -20,6 +20,7 @@#include <linux/module.h> #include <linux/raid/raid0.h> +#include <linux/bio.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
drivers/md/md.c renamed from drivers/md/md.c~cleanup-highmem-no-bio +1 -0
@@ -33,6 +33,7 @@#include <linux/linkage.h> #include <linux/raid/md.h> #include <linux/sysctl.h> +#include <linux/bio.h> #include <linux/raid/xor.h> #include <linux/devfs_fs_kernel.h>
drivers/scsi/scsi_lib.c renamed from drivers/scsi/scsi_lib.c~cleanup-highmem-no-bio +1 -0
@@ -23,6 +23,7 @@#include <linux/timer.h> #include <linux/string.h> #include <linux/slab.h> +#include <linux/bio.h> #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/stat.h>
drivers/scsi/sd.c renamed from drivers/scsi/sd.c~cleanup-highmem-no-bio +1 -0
@@ -36,6 +36,7 @@#include <linux/kernel.h> #include <linux/sched.h> #include <linux/mm.h> +#include <linux/bio.h> #include <linux/string.h> #include <linux/hdreg.h> #include <linux/errno.h>
drivers/block/cpqarray.c renamed from drivers/block/cpqarray.c~cleanup-highmem-no-bio +1 -0
@@ -24,6 +24,7 @@#include <linux/version.h> #include <linux/types.h> #include <linux/pci.h> +#include <linux/bio.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/delay.h>
drivers/block/DAC960.c renamed from drivers/block/DAC960.c~cleanup-highmem-no-bio +1 -0
@@ -28,6 +28,7 @@#include <linux/types.h> #include <linux/blk.h> #include <linux/blkdev.h> +#include <linux/bio.h> #include <linux/completion.h> #include <linux/delay.h> #include <linux/genhd.h>
drivers/block/cciss.c renamed from drivers/block/cciss.c~cleanup-highmem-no-bio +1 -0
@@ -30,6 +30,7 @@#include <linux/delay.h> #include <linux/major.h> #include <linux/fs.h> +#include <linux/bio.h> #include <linux/blkpg.h> #include <linux/timer.h> #include <linux/proc_fs.h>
drivers/block/umem.c renamed from drivers/block/umem.c~cleanup-highmem-no-bio +1 -0
@@ -37,6 +37,7 @@#include <linux/config.h> #include <linux/sched.h> #include <linux/fs.h> +#include <linux/bio.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/mman.h>
drivers/block/nbd.c renamed from drivers/block/nbd.c~cleanup-highmem-no-bio +1 -0
@@ -39,6 +39,7 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/fs.h> +#include <linux/bio.h> #include <linux/stat.h> #include <linux/errno.h> #include <linux/file.h>
drivers/md/raid1.c renamed from drivers/md/raid1.c~cleanup-highmem-no-bio +1 -0
@@ -23,6 +23,7 @@*/ #include <linux/raid/raid1.h> +#include <linux/bio.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
drivers/md/raid5.c renamed from drivers/md/raid5.c~cleanup-highmem-no-bio +1 -0
@@ -20,6 +20,7 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/raid/raid5.h> +#include <linux/bio.h> #include <asm/bitops.h> #include <asm/atomic.h>
drivers/md/lvm.c renamed from drivers/md/lvm.c~cleanup-highmem-no-bio +1 -0
@@ -209,6 +209,7 @@#include <linux/hdreg.h> #include <linux/stat.h> #include <linux/fs.h> +#include <linux/bio.h> #include <linux/proc_fs.h> #include <linux/blkdev.h> #include <linux/genhd.h>
drivers/md/multipath.c renamed from drivers/md/multipath.c~cleanup-highmem-no-bio +1 -0
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/raid/multipath.h> +#include <linux/bio.h> #include <linux/buffer_head.h> #include <asm/atomic.h>
include/linux/raid/raid5.h renamed from include/linux/raid/raid5.h~cleanup-highmem-no-bio +1 -0
@@ -3,6 +3,7 @@#include <linux/raid/md.h> #include <linux/raid/xor.h> +#include <linux/bio.h> /* *
fs/jfs/jfs_logmgr.c renamed from fs/jfs/jfs_logmgr.c~cleanup-highmem-no-bio +1 -0
@@ -65,6 +65,7 @@#include <linux/smp_lock.h> #include <linux/completion.h> #include <linux/buffer_head.h> /* for sync_blockdev() */ +#include <linux/bio.h> #include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_metapage.h"
drivers/scsi/cpqfcTSinit.c renamed from drivers/scsi/cpqfcTSinit.c~cleanup-highmem-no-bio +1 -0
@@ -39,6 +39,7 @@#include <linux/pci.h> #include <linux/delay.h> #include <linux/timer.h> +#include <linux/init.h> #include <linux/ioport.h> // request_region() prototype #include <linux/vmalloc.h> // ioremap() //#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,7)
drivers/scsi/sr.c renamed from drivers/scsi/sr.c~cleanup-highmem-no-bio +1 -0
@@ -39,6 +39,7 @@#include <linux/kernel.h> #include <linux/sched.h> #include <linux/mm.h> +#include <linux/bio.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/cdrom.h>
-