diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7b7b507ffa1c..090f0eacde29 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -34,9 +34,9 @@ | |||
34 | #define SEEK_MAX SEEK_END | 34 | #define SEEK_MAX SEEK_END |
35 | 35 | ||
36 | struct fstrim_range { | 36 | struct fstrim_range { |
37 | uint64_t start; | 37 | __u64 start; |
38 | uint64_t len; | 38 | __u64 len; |
39 | uint64_t minlen; | 39 | __u64 minlen; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | /* And dynamically-tunable limits and defaults: */ | 42 | /* And dynamically-tunable limits and defaults: */ |
@@ -602,6 +602,7 @@ struct address_space_operations { | |||
602 | sector_t (*bmap)(struct address_space *, sector_t); | 602 | sector_t (*bmap)(struct address_space *, sector_t); |
603 | void (*invalidatepage) (struct page *, unsigned long); | 603 | void (*invalidatepage) (struct page *, unsigned long); |
604 | int (*releasepage) (struct page *, gfp_t); | 604 | int (*releasepage) (struct page *, gfp_t); |
605 | void (*freepage)(struct page *); | ||
605 | ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, | 606 | ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, |
606 | loff_t offset, unsigned long nr_segs); | 607 | loff_t offset, unsigned long nr_segs); |
607 | int (*get_xip_mem)(struct address_space *, pgoff_t, int, | 608 | int (*get_xip_mem)(struct address_space *, pgoff_t, int, |
@@ -1056,7 +1057,6 @@ struct lock_manager_operations { | |||
1056 | int (*fl_compare_owner)(struct file_lock *, struct file_lock *); | 1057 | int (*fl_compare_owner)(struct file_lock *, struct file_lock *); |
1057 | void (*fl_notify)(struct file_lock *); /* unblock callback */ | 1058 | void (*fl_notify)(struct file_lock *); /* unblock callback */ |
1058 | int (*fl_grant)(struct file_lock *, struct file_lock *, int); | 1059 | int (*fl_grant)(struct file_lock *, struct file_lock *, int); |
1059 | void (*fl_copy_lock)(struct file_lock *, struct file_lock *); | ||
1060 | void (*fl_release_private)(struct file_lock *); | 1060 | void (*fl_release_private)(struct file_lock *); |
1061 | void (*fl_break)(struct file_lock *); | 1061 | void (*fl_break)(struct file_lock *); |
1062 | int (*fl_mylease)(struct file_lock *, struct file_lock *); | 1062 | int (*fl_mylease)(struct file_lock *, struct file_lock *); |
@@ -1129,6 +1129,7 @@ extern int fcntl_setlease(unsigned int fd, struct file *filp, long arg); | |||
1129 | extern int fcntl_getlease(struct file *filp); | 1129 | extern int fcntl_getlease(struct file *filp); |
1130 | 1130 | ||
1131 | /* fs/locks.c */ | 1131 | /* fs/locks.c */ |
1132 | void locks_free_lock(struct file_lock *fl); | ||
1132 | extern void locks_init_lock(struct file_lock *); | 1133 | extern void locks_init_lock(struct file_lock *); |
1133 | extern struct file_lock * locks_alloc_lock(void); | 1134 | extern struct file_lock * locks_alloc_lock(void); |
1134 | extern void locks_copy_lock(struct file_lock *, struct file_lock *); | 1135 | extern void locks_copy_lock(struct file_lock *, struct file_lock *); |
@@ -1612,7 +1613,6 @@ struct super_operations { | |||
1612 | ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); | 1613 | ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); |
1613 | #endif | 1614 | #endif |
1614 | int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); | 1615 | int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); |
1615 | int (*trim_fs) (struct super_block *, struct fstrim_range *); | ||
1616 | }; | 1616 | }; |
1617 | 1617 | ||
1618 | /* | 1618 | /* |