diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/buffer_head.h | 2 | ||||
| -rw-r--r-- | include/linux/ext3_fs.h | 2 | ||||
| -rw-r--r-- | include/linux/fb.h | 5 | ||||
| -rw-r--r-- | include/linux/fs.h | 8 |
4 files changed, 7 insertions, 10 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 16ed0284d780..05e5f5996216 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
| @@ -224,7 +224,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, | |||
| 224 | void block_sync_page(struct page *); | 224 | void block_sync_page(struct page *); |
| 225 | sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); | 225 | sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); |
| 226 | int block_truncate_page(struct address_space *, loff_t, get_block_t *); | 226 | int block_truncate_page(struct address_space *, loff_t, get_block_t *); |
| 227 | int file_fsync(struct file *, struct dentry *, int); | 227 | int file_fsync(struct file *, int); |
| 228 | int nobh_write_begin(struct file *, struct address_space *, | 228 | int nobh_write_begin(struct file *, struct address_space *, |
| 229 | loff_t, unsigned, unsigned, | 229 | loff_t, unsigned, unsigned, |
| 230 | struct page **, void **, get_block_t*); | 230 | struct page **, void **, get_block_t*); |
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index 5f494b465097..7fc62d4550b2 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
| @@ -868,7 +868,7 @@ extern int ext3_htree_store_dirent(struct file *dir_file, __u32 hash, | |||
| 868 | extern void ext3_htree_free_dir_info(struct dir_private_info *p); | 868 | extern void ext3_htree_free_dir_info(struct dir_private_info *p); |
| 869 | 869 | ||
| 870 | /* fsync.c */ | 870 | /* fsync.c */ |
| 871 | extern int ext3_sync_file (struct file *, struct dentry *, int); | 871 | extern int ext3_sync_file(struct file *, int); |
| 872 | 872 | ||
| 873 | /* hash.c */ | 873 | /* hash.c */ |
| 874 | extern int ext3fs_dirhash(const char *name, int len, struct | 874 | extern int ext3fs_dirhash(const char *name, int len, struct |
diff --git a/include/linux/fb.h b/include/linux/fb.h index f3793ebc241c..907ace3a64c8 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -4,8 +4,6 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/i2c.h> | 5 | #include <linux/i2c.h> |
| 6 | 6 | ||
| 7 | struct dentry; | ||
| 8 | |||
| 9 | /* Definitions of frame buffers */ | 7 | /* Definitions of frame buffers */ |
| 10 | 8 | ||
| 11 | #define FB_MAX 32 /* sufficient for now */ | 9 | #define FB_MAX 32 /* sufficient for now */ |
| @@ -1017,8 +1015,7 @@ extern void fb_deferred_io_open(struct fb_info *info, | |||
| 1017 | struct inode *inode, | 1015 | struct inode *inode, |
| 1018 | struct file *file); | 1016 | struct file *file); |
| 1019 | extern void fb_deferred_io_cleanup(struct fb_info *info); | 1017 | extern void fb_deferred_io_cleanup(struct fb_info *info); |
| 1020 | extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, | 1018 | extern int fb_deferred_io_fsync(struct file *file, int datasync); |
| 1021 | int datasync); | ||
| 1022 | 1019 | ||
| 1023 | static inline bool fb_be_math(struct fb_info *info) | 1020 | static inline bool fb_be_math(struct fb_info *info) |
| 1024 | { | 1021 | { |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3d9ed8302402..eb39e5eb77f5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1498,7 +1498,7 @@ struct file_operations { | |||
| 1498 | int (*open) (struct inode *, struct file *); | 1498 | int (*open) (struct inode *, struct file *); |
| 1499 | int (*flush) (struct file *, fl_owner_t id); | 1499 | int (*flush) (struct file *, fl_owner_t id); |
| 1500 | int (*release) (struct inode *, struct file *); | 1500 | int (*release) (struct inode *, struct file *); |
| 1501 | int (*fsync) (struct file *, struct dentry *, int datasync); | 1501 | int (*fsync) (struct file *, int datasync); |
| 1502 | int (*aio_fsync) (struct kiocb *, int datasync); | 1502 | int (*aio_fsync) (struct kiocb *, int datasync); |
| 1503 | int (*fasync) (int, struct file *, int); | 1503 | int (*fasync) (int, struct file *, int); |
| 1504 | int (*lock) (struct file *, int, struct file_lock *); | 1504 | int (*lock) (struct file *, int, struct file_lock *); |
| @@ -2213,7 +2213,7 @@ extern int generic_segment_checks(const struct iovec *iov, | |||
| 2213 | /* fs/block_dev.c */ | 2213 | /* fs/block_dev.c */ |
| 2214 | extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, | 2214 | extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, |
| 2215 | unsigned long nr_segs, loff_t pos); | 2215 | unsigned long nr_segs, loff_t pos); |
| 2216 | extern int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync); | 2216 | extern int blkdev_fsync(struct file *filp, int datasync); |
| 2217 | 2217 | ||
| 2218 | /* fs/splice.c */ | 2218 | /* fs/splice.c */ |
| 2219 | extern ssize_t generic_file_splice_read(struct file *, loff_t *, | 2219 | extern ssize_t generic_file_splice_read(struct file *, loff_t *, |
| @@ -2348,7 +2348,7 @@ extern int simple_link(struct dentry *, struct inode *, struct dentry *); | |||
| 2348 | extern int simple_unlink(struct inode *, struct dentry *); | 2348 | extern int simple_unlink(struct inode *, struct dentry *); |
| 2349 | extern int simple_rmdir(struct inode *, struct dentry *); | 2349 | extern int simple_rmdir(struct inode *, struct dentry *); |
| 2350 | extern int simple_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); | 2350 | extern int simple_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); |
| 2351 | extern int simple_sync_file(struct file *, struct dentry *, int); | 2351 | extern int simple_sync_file(struct file *, int); |
| 2352 | extern int simple_empty(struct dentry *); | 2352 | extern int simple_empty(struct dentry *); |
| 2353 | extern int simple_readpage(struct file *file, struct page *page); | 2353 | extern int simple_readpage(struct file *file, struct page *page); |
| 2354 | extern int simple_write_begin(struct file *file, struct address_space *mapping, | 2354 | extern int simple_write_begin(struct file *file, struct address_space *mapping, |
| @@ -2373,7 +2373,7 @@ extern ssize_t simple_read_from_buffer(void __user *to, size_t count, | |||
| 2373 | extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos, | 2373 | extern ssize_t simple_write_to_buffer(void *to, size_t available, loff_t *ppos, |
| 2374 | const void __user *from, size_t count); | 2374 | const void __user *from, size_t count); |
| 2375 | 2375 | ||
| 2376 | extern int simple_fsync(struct file *, struct dentry *, int); | 2376 | extern int simple_fsync(struct file *, int); |
| 2377 | 2377 | ||
| 2378 | #ifdef CONFIG_MIGRATION | 2378 | #ifdef CONFIG_MIGRATION |
| 2379 | extern int buffer_migrate_page(struct address_space *, | 2379 | extern int buffer_migrate_page(struct address_space *, |
