Skip to content

Commit a27bb33

Browse files
Kent Overstreettorvalds
Kent Overstreet
authored andcommitted
aio: don't include aio.h in sched.h
Faster kernel compiles by way of fewer unnecessary includes. [[email protected]: fix fallout] [[email protected]: fix build] Signed-off-by: Kent Overstreet <[email protected]> Cc: Zach Brown <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Asai Thambi S P <[email protected]> Cc: Selvan Mani <[email protected]> Cc: Sam Bradshaw <[email protected]> Cc: Jeff Moyer <[email protected]> Cc: Al Viro <[email protected]> Cc: Benjamin LaHaise <[email protected]> Reviewed-by: "Theodore Ts'o" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 41ef4eb commit a27bb33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+58
-7
lines changed

arch/s390/hypfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/module.h>
2222
#include <linux/seq_file.h>
2323
#include <linux/mount.h>
24+
#include <linux/aio.h>
2425
#include <asm/ebcdic.h>
2526
#include "hypfs.h"
2627

block/scsi_ioctl.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/ratelimit.h>
2828
#include <linux/slab.h>
2929
#include <linux/times.h>
30+
#include <linux/uio.h>
3031
#include <asm/uaccess.h>
3132

3233
#include <scsi/scsi.h>

drivers/char/mem.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/pfn.h>
2929
#include <linux/export.h>
3030
#include <linux/io.h>
31+
#include <linux/aio.h>
3132

3233
#include <asm/uaccess.h>
3334

drivers/infiniband/hw/ipath/ipath_file_ops.c

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <linux/slab.h>
4141
#include <linux/highmem.h>
4242
#include <linux/io.h>
43+
#include <linux/aio.h>
4344
#include <linux/jiffies.h>
4445
#include <linux/cpu.h>
4546
#include <asm/pgtable.h>

drivers/infiniband/hw/qib/qib_file_ops.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <linux/vmalloc.h>
4040
#include <linux/highmem.h>
4141
#include <linux/io.h>
42-
#include <linux/uio.h>
42+
#include <linux/aio.h>
4343
#include <linux/jiffies.h>
4444
#include <asm/pgtable.h>
4545
#include <linux/delay.h>

drivers/scsi/sg.c

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ static int sg_version_num = 30534; /* 2 digits for each component */
3535
#include <linux/sched.h>
3636
#include <linux/string.h>
3737
#include <linux/mm.h>
38+
#include <linux/aio.h>
3839
#include <linux/errno.h>
3940
#include <linux/mtio.h>
4041
#include <linux/ioctl.h>

drivers/staging/android/logger.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/slab.h>
2929
#include <linux/time.h>
3030
#include <linux/vmalloc.h>
31+
#include <linux/aio.h>
3132
#include "logger.h"
3233

3334
#include <asm/ioctls.h>

fs/9p/vfs_addr.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <linux/pagemap.h>
3434
#include <linux/idr.h>
3535
#include <linux/sched.h>
36+
#include <linux/aio.h>
3637
#include <net/9p/9p.h>
3738
#include <net/9p/client.h>
3839

fs/afs/write.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/pagemap.h>
1515
#include <linux/writeback.h>
1616
#include <linux/pagevec.h>
17+
#include <linux/aio.h>
1718
#include "internal.h"
1819

1920
static int afs_write_back_from_locked_page(struct afs_writeback *wb,

fs/bio.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/swap.h>
2020
#include <linux/bio.h>
2121
#include <linux/blkdev.h>
22+
#include <linux/uio.h>
2223
#include <linux/iocontext.h>
2324
#include <linux/slab.h>
2425
#include <linux/init.h>

fs/block_dev.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/namei.h>
2828
#include <linux/log2.h>
2929
#include <linux/cleancache.h>
30+
#include <linux/aio.h>
3031
#include <asm/uaccess.h>
3132
#include "internal.h"
3233

fs/btrfs/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <linux/string.h>
2525
#include <linux/backing-dev.h>
2626
#include <linux/mpage.h>
27+
#include <linux/aio.h>
2728
#include <linux/falloc.h>
2829
#include <linux/swap.h>
2930
#include <linux/writeback.h>

fs/btrfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <linux/writeback.h>
3333
#include <linux/statfs.h>
3434
#include <linux/compat.h>
35+
#include <linux/aio.h>
3536
#include <linux/bit_spinlock.h>
3637
#include <linux/xattr.h>
3738
#include <linux/posix_acl.h>

fs/ceph/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/mount.h>
88
#include <linux/namei.h>
99
#include <linux/writeback.h>
10+
#include <linux/aio.h>
1011

1112
#include "super.h"
1213
#include "mds_client.h"

fs/compat.c

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include <linux/fs_struct.h>
4848
#include <linux/slab.h>
4949
#include <linux/pagemap.h>
50+
#include <linux/aio.h>
5051

5152
#include <asm/uaccess.h>
5253
#include <asm/mmu_context.h>

fs/direct-io.c

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <linux/uio.h>
3838
#include <linux/atomic.h>
3939
#include <linux/prefetch.h>
40+
#include <linux/aio.h>
4041

4142
/*
4243
* How many user pages to map in one call to get_user_pages(). This determines

fs/ecryptfs/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/security.h>
3232
#include <linux/compat.h>
3333
#include <linux/fs_stack.h>
34+
#include <linux/aio.h>
3435
#include "ecryptfs_kernel.h"
3536

3637
/**

fs/ext2/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/mpage.h>
3232
#include <linux/fiemap.h>
3333
#include <linux/namei.h>
34+
#include <linux/aio.h>
3435
#include "ext2.h"
3536
#include "acl.h"
3637
#include "xip.h"

fs/ext3/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/writeback.h>
2828
#include <linux/mpage.h>
2929
#include <linux/namei.h>
30+
#include <linux/aio.h>
3031
#include "ext3.h"
3132
#include "xattr.h"
3233
#include "acl.h"

fs/ext4/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/jbd2.h>
2424
#include <linux/mount.h>
2525
#include <linux/path.h>
26+
#include <linux/aio.h>
2627
#include <linux/quotaops.h>
2728
#include <linux/pagevec.h>
2829
#include "ext4.h"

fs/ext4/indirect.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* ([email protected]), 1993, 1998
2121
*/
2222

23+
#include <linux/aio.h>
2324
#include "ext4_jbd2.h"
2425
#include "truncate.h"
2526
#include "ext4_extents.h" /* Needed for EXT_MAX_BLOCKS */

fs/ext4/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <linux/printk.h>
3838
#include <linux/slab.h>
3939
#include <linux/ratelimit.h>
40+
#include <linux/aio.h>
4041

4142
#include "ext4_jbd2.h"
4243
#include "xattr.h"

fs/ext4/page-io.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/pagevec.h>
1919
#include <linux/mpage.h>
2020
#include <linux/namei.h>
21+
#include <linux/aio.h>
2122
#include <linux/uio.h>
2223
#include <linux/bio.h>
2324
#include <linux/workqueue.h>

fs/f2fs/data.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/f2fs_fs.h>
1313
#include <linux/buffer_head.h>
1414
#include <linux/mpage.h>
15+
#include <linux/aio.h>
1516
#include <linux/writeback.h>
1617
#include <linux/backing-dev.h>
1718
#include <linux/blkdev.h>

fs/fat/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/mpage.h>
2020
#include <linux/buffer_head.h>
2121
#include <linux/mount.h>
22+
#include <linux/aio.h>
2223
#include <linux/vfs.h>
2324
#include <linux/parser.h>
2425
#include <linux/uio.h>

fs/fuse/cuse.c

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <linux/device.h>
3939
#include <linux/file.h>
4040
#include <linux/fs.h>
41+
#include <linux/aio.h>
4142
#include <linux/kdev_t.h>
4243
#include <linux/kthread.h>
4344
#include <linux/list.h>

fs/fuse/dev.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/pipe_fs_i.h>
2020
#include <linux/swap.h>
2121
#include <linux/splice.h>
22+
#include <linux/aio.h>
2223

2324
MODULE_ALIAS_MISCDEV(FUSE_MINOR);
2425
MODULE_ALIAS("devname:fuse");

fs/fuse/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/compat.h>
1717
#include <linux/swap.h>
18+
#include <linux/aio.h>
1819

1920
static const struct file_operations fuse_direct_io_file_operations;
2021

fs/gfs2/aops.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <linux/swap.h>
2121
#include <linux/gfs2_ondisk.h>
2222
#include <linux/backing-dev.h>
23+
#include <linux/aio.h>
2324

2425
#include "gfs2.h"
2526
#include "incore.h"

fs/gfs2/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <asm/uaccess.h>
2626
#include <linux/dlm.h>
2727
#include <linux/dlm_plock.h>
28+
#include <linux/aio.h>
2829

2930
#include "gfs2.h"
3031
#include "incore.h"

fs/hfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/pagemap.h>
1515
#include <linux/mpage.h>
1616
#include <linux/sched.h>
17+
#include <linux/aio.h>
1718

1819
#include "hfs_fs.h"
1920
#include "btree.h"

fs/hfsplus/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/pagemap.h>
1515
#include <linux/mpage.h>
1616
#include <linux/sched.h>
17+
#include <linux/aio.h>
1718

1819
#include "hfsplus_fs.h"
1920
#include "hfsplus_raw.h"

fs/jfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/pagemap.h>
2424
#include <linux/quotaops.h>
2525
#include <linux/writeback.h>
26+
#include <linux/aio.h>
2627
#include "jfs_incore.h"
2728
#include "jfs_inode.h"
2829
#include "jfs_filsys.h"

fs/nilfs2/inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/gfp.h>
2626
#include <linux/mpage.h>
2727
#include <linux/writeback.h>
28-
#include <linux/uio.h>
28+
#include <linux/aio.h>
2929
#include "nilfs.h"
3030
#include "btnode.h"
3131
#include "segment.h"

fs/ntfs/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/swap.h>
2828
#include <linux/uio.h>
2929
#include <linux/writeback.h>
30+
#include <linux/aio.h>
3031

3132
#include <asm/page.h>
3233
#include <asm/uaccess.h>

fs/ntfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/quotaops.h>
2929
#include <linux/slab.h>
3030
#include <linux/log2.h>
31+
#include <linux/aio.h>
3132

3233
#include "aops.h"
3334
#include "attrib.h"

fs/ocfs2/aops.h

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#ifndef OCFS2_AOPS_H
2323
#define OCFS2_AOPS_H
2424

25+
#include <linux/aio.h>
26+
2527
handle_t *ocfs2_start_walk_page_trans(struct inode *inode,
2628
struct page *page,
2729
unsigned from,

fs/ocfs2/inode.h

-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ void ocfs2_refresh_inode(struct inode *inode,
147147
int ocfs2_mark_inode_dirty(handle_t *handle,
148148
struct inode *inode,
149149
struct buffer_head *bh);
150-
int ocfs2_aio_read(struct file *file, struct kiocb *req, struct iocb *iocb);
151-
int ocfs2_aio_write(struct file *file, struct kiocb *req, struct iocb *iocb);
152150
struct buffer_head *ocfs2_bread(struct inode *inode,
153151
int block, int *err, int reada);
154152

fs/pipe.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/audit.h>
2222
#include <linux/syscalls.h>
2323
#include <linux/fcntl.h>
24+
#include <linux/aio.h>
2425

2526
#include <asm/uaccess.h>
2627
#include <asm/ioctls.h>

fs/read_write.c

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/fcntl.h>
1010
#include <linux/file.h>
1111
#include <linux/uio.h>
12+
#include <linux/aio.h>
1213
#include <linux/fsnotify.h>
1314
#include <linux/security.h>
1415
#include <linux/export.h>

fs/reiserfs/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/writeback.h>
1919
#include <linux/quotaops.h>
2020
#include <linux/swap.h>
21+
#include <linux/aio.h>
2122

2223
int reiserfs_commit_write(struct file *f, struct page *page,
2324
unsigned from, unsigned to);

fs/ubifs/file.c

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
*/
5151

5252
#include "ubifs.h"
53+
#include <linux/aio.h>
5354
#include <linux/mount.h>
5455
#include <linux/namei.h>
5556
#include <linux/slab.h>

fs/udf/inode.c

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <linux/slab.h>
3939
#include <linux/crc-itu-t.h>
4040
#include <linux/mpage.h>
41+
#include <linux/aio.h>
4142

4243
#include "udf_i.h"
4344
#include "udf_sb.h"

fs/xfs/xfs_aops.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "xfs_vnodeops.h"
3232
#include "xfs_trace.h"
3333
#include "xfs_bmap.h"
34+
#include <linux/aio.h>
3435
#include <linux/gfp.h>
3536
#include <linux/mpage.h>
3637
#include <linux/pagevec.h>

fs/xfs/xfs_file.c

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "xfs_ioctl.h"
3737
#include "xfs_trace.h"
3838

39+
#include <linux/aio.h>
3940
#include <linux/dcache.h>
4041
#include <linux/falloc.h>
4142
#include <linux/pagevec.h>

include/linux/cgroup.h

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ struct cgroup_subsys;
2828
struct inode;
2929
struct cgroup;
3030
struct css_id;
31+
struct eventfd_ctx;
3132

3233
extern int cgroup_init_early(void);
3334
extern int cgroup_init(void);

include/linux/pid_namespace.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <linux/sched.h>
55
#include <linux/bug.h>
66
#include <linux/mm.h>
7+
#include <linux/workqueue.h>
78
#include <linux/threads.h>
89
#include <linux/nsproxy.h>
910
#include <linux/kref.h>

include/linux/sched.h

-2
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,6 @@ extern void schedule_preempt_disabled(void);
313313
struct nsproxy;
314314
struct user_namespace;
315315

316-
#include <linux/aio.h>
317-
318316
#ifdef CONFIG_MMU
319317
extern void arch_pick_mmap_layout(struct mm_struct *mm);
320318
extern unsigned long

include/linux/writeback.h

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#define WRITEBACK_H
66

77
#include <linux/sched.h>
8+
#include <linux/workqueue.h>
89
#include <linux/fs.h>
910

1011
DECLARE_PER_CPU(int, dirty_throttle_leaks);

0 commit comments

Comments
 (0)