---

yaml --- r: 372729 b: refs/heads/master c: c0bd14a h: refs/heads/master i: 372727: 0749fe1 v: v3
git-mirror · May 4, 2013 · db8bf4d · db8bf4d
1 parent 06b5347
commit db8bf4d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ae98f1589e076e4b314fc54ae2beac58842ddc2
+refs/heads/master: c0bd14af51a470895448f88edd1315c4fa0b0d27
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
@@ -67,8 +67,6 @@ int compat_printk(const char *fmt, ...)
 	return ret;
 }
 
-#include "read_write.h"
-
 /*
  * Not all architectures have sys_utime, so implement this in terms
  * of sys_utimes.

diff --git a/trunk/fs/read_write.c b/trunk/fs/read_write.c
@@ -16,12 +16,15 @@
 #include <linux/pagemap.h>
 #include <linux/splice.h>
 #include <linux/compat.h>
-#include "read_write.h"
 #include "internal.h"
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
+typedef ssize_t (*io_fn_t)(struct file *, char __user *, size_t, loff_t *);
+typedef ssize_t (*iov_fn_t)(struct kiocb *, const struct iovec *,
+		unsigned long, loff_t);
+
 const struct file_operations generic_ro_fops = {
 	.llseek		= generic_file_llseek,
 	.read		= do_sync_read,

diff --git a/trunk/fs/read_write.h b/trunk/fs/read_write.h