From db8bf4d374b3e147f4804f2d802b202e21ec23d9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 4 May 2013 15:00:54 -0400
Subject: [PATCH] --- yaml --- r: 372729 b: refs/heads/master c:
 c0bd14af51a470895448f88edd1315c4fa0b0d27 h: refs/heads/master i:   372727:
 0749fe1b79c935dd8ad2b598eb262360f0f7b4b3 v: v3

---
 [refs]                | 2 +-
 trunk/fs/compat.c     | 2 --
 trunk/fs/read_write.c | 5 ++++-
 trunk/fs/read_write.h | 9 ---------
 4 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 trunk/fs/read_write.h

diff --git a/[refs] b/[refs]
index 3c9a5bf28a73..c4d5b9a3142e 100644
--- 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
index d0560c93973d..93f7d021b716 100644
--- 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
index 605dbbcb1973..90ba3b350e50 100644
--- 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
deleted file mode 100644
index 0ec530d9305b..000000000000
--- a/trunk/fs/read_write.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * This file is only for sharing some helpers from read_write.c with compat.c.
- * Don't use anywhere else.
- */
-
-
-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);