diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4f0b3bf5983c..e68780810279 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -44,7 +44,7 @@ extern int get_max_files(void); | |||
44 | struct inodes_stat_t { | 44 | struct inodes_stat_t { |
45 | int nr_inodes; | 45 | int nr_inodes; |
46 | int nr_unused; | 46 | int nr_unused; |
47 | int dummy[5]; | 47 | int dummy[5]; /* padding for sysctl ABI compatibility */ |
48 | }; | 48 | }; |
49 | extern struct inodes_stat_t inodes_stat; | 49 | extern struct inodes_stat_t inodes_stat; |
50 | 50 | ||
@@ -820,6 +820,10 @@ struct file_lock { | |||
820 | union { | 820 | union { |
821 | struct nfs_lock_info nfs_fl; | 821 | struct nfs_lock_info nfs_fl; |
822 | struct nfs4_lock_info nfs4_fl; | 822 | struct nfs4_lock_info nfs4_fl; |
823 | struct { | ||
824 | struct list_head link; /* link in AFS vnode's pending_locks list */ | ||
825 | int state; /* state of grant or error if -ve */ | ||
826 | } afs; | ||
823 | } fl_u; | 827 | } fl_u; |
824 | }; | 828 | }; |
825 | 829 | ||
@@ -1610,6 +1614,9 @@ extern int __invalidate_device(struct block_device *); | |||
1610 | extern int invalidate_partition(struct gendisk *, int); | 1614 | extern int invalidate_partition(struct gendisk *, int); |
1611 | #endif | 1615 | #endif |
1612 | extern int invalidate_inodes(struct super_block *); | 1616 | extern int invalidate_inodes(struct super_block *); |
1617 | unsigned long __invalidate_mapping_pages(struct address_space *mapping, | ||
1618 | pgoff_t start, pgoff_t end, | ||
1619 | bool be_atomic); | ||
1613 | unsigned long invalidate_mapping_pages(struct address_space *mapping, | 1620 | unsigned long invalidate_mapping_pages(struct address_space *mapping, |
1614 | pgoff_t start, pgoff_t end); | 1621 | pgoff_t start, pgoff_t end); |
1615 | 1622 | ||