diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index d8e2762ed14d..9c2ac5c0ef5c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -918,12 +918,12 @@ struct file_lock { | |||
918 | struct list_head fl_link; /* doubly linked list of all locks */ | 918 | struct list_head fl_link; /* doubly linked list of all locks */ |
919 | struct list_head fl_block; /* circular list of blocked processes */ | 919 | struct list_head fl_block; /* circular list of blocked processes */ |
920 | fl_owner_t fl_owner; | 920 | fl_owner_t fl_owner; |
921 | unsigned char fl_flags; | ||
922 | unsigned char fl_type; | ||
921 | unsigned int fl_pid; | 923 | unsigned int fl_pid; |
922 | struct pid *fl_nspid; | 924 | struct pid *fl_nspid; |
923 | wait_queue_head_t fl_wait; | 925 | wait_queue_head_t fl_wait; |
924 | struct file *fl_file; | 926 | struct file *fl_file; |
925 | unsigned char fl_flags; | ||
926 | unsigned char fl_type; | ||
927 | loff_t fl_start; | 927 | loff_t fl_start; |
928 | loff_t fl_end; | 928 | loff_t fl_end; |
929 | 929 | ||
@@ -1729,6 +1729,8 @@ static inline void invalidate_remote_inode(struct inode *inode) | |||
1729 | extern int invalidate_inode_pages2(struct address_space *mapping); | 1729 | extern int invalidate_inode_pages2(struct address_space *mapping); |
1730 | extern int invalidate_inode_pages2_range(struct address_space *mapping, | 1730 | extern int invalidate_inode_pages2_range(struct address_space *mapping, |
1731 | pgoff_t start, pgoff_t end); | 1731 | pgoff_t start, pgoff_t end); |
1732 | extern void generic_sync_sb_inodes(struct super_block *sb, | ||
1733 | struct writeback_control *wbc); | ||
1732 | extern int write_inode_now(struct inode *, int); | 1734 | extern int write_inode_now(struct inode *, int); |
1733 | extern int filemap_fdatawrite(struct address_space *); | 1735 | extern int filemap_fdatawrite(struct address_space *); |
1734 | extern int filemap_flush(struct address_space *); | 1736 | extern int filemap_flush(struct address_space *); |
@@ -1740,6 +1742,8 @@ extern int wait_on_page_writeback_range(struct address_space *mapping, | |||
1740 | pgoff_t start, pgoff_t end); | 1742 | pgoff_t start, pgoff_t end); |
1741 | extern int __filemap_fdatawrite_range(struct address_space *mapping, | 1743 | extern int __filemap_fdatawrite_range(struct address_space *mapping, |
1742 | loff_t start, loff_t end, int sync_mode); | 1744 | loff_t start, loff_t end, int sync_mode); |
1745 | extern int filemap_fdatawrite_range(struct address_space *mapping, | ||
1746 | loff_t start, loff_t end); | ||
1743 | 1747 | ||
1744 | extern long do_fsync(struct file *file, int datasync); | 1748 | extern long do_fsync(struct file *file, int datasync); |
1745 | extern void sync_supers(void); | 1749 | extern void sync_supers(void); |
@@ -1870,7 +1874,8 @@ extern void | |||
1870 | file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); | 1874 | file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); |
1871 | extern loff_t no_llseek(struct file *file, loff_t offset, int origin); | 1875 | extern loff_t no_llseek(struct file *file, loff_t offset, int origin); |
1872 | extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin); | 1876 | extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin); |
1873 | extern loff_t remote_llseek(struct file *file, loff_t offset, int origin); | 1877 | extern loff_t generic_file_llseek_unlocked(struct file *file, loff_t offset, |
1878 | int origin); | ||
1874 | extern int generic_file_open(struct inode * inode, struct file * filp); | 1879 | extern int generic_file_open(struct inode * inode, struct file * filp); |
1875 | extern int nonseekable_open(struct inode * inode, struct file * filp); | 1880 | extern int nonseekable_open(struct inode * inode, struct file * filp); |
1876 | 1881 | ||