diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2018-07-18 15:39:29 +0200 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2018-07-18 15:39:29 +0200 |
commit | 51e6ce820bd43e51883eddf291bd830217bb6382 (patch) | |
tree | 09c8a4bc00eb4aaec3652f1e8c1941da63232d09 /include | |
parent | 9951934d76b04570d4ccbc8d768530b6b7d69edf (diff) | |
parent | 1b4f42a1e33fec999e94802df13dbd7521315742 (diff) | |
download | linux-stable-51e6ce820bd43e51883eddf291bd830217bb6382.tar.gz linux-stable-51e6ce820bd43e51883eddf291bd830217bb6382.tar.bz2 linux-stable-51e6ce820bd43e51883eddf291bd830217bb6382.zip |
Merge branch 'dedupe-cleanup' into overlayfs-next
Following series for stacking overlay files depends on this mini series.
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4ff7b7012186..5ce2b413abc6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1751,7 +1751,7 @@ struct file_operations { loff_t, size_t, unsigned int); int (*clone_file_range)(struct file *, loff_t, struct file *, loff_t, u64); - ssize_t (*dedupe_file_range)(struct file *, u64, u64, struct file *, + int (*dedupe_file_range)(struct file *, loff_t, struct file *, loff_t, u64); } __randomize_layout; |