Merge branch 'dedupe-cleanup' into overlayfs-next

Following series for stacking overlay files depends on this mini series.
2018-07-18 15:39:29 +02:00
parent 9951934d76 1b4f42a1e3
commit 51e6ce820b
6 changed files with 74 additions and 84 deletions
--- 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;