From 85b77100b25eae963e7874019953d7f46f9b3cf7 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 26 Jun 2006 00:24:57 -0700
Subject: [PATCH] --- yaml --- r: 30193 b: refs/heads/master c:
 9637f28f8b9facff53b00bea6b5d27c9b150b422 h: refs/heads/master i:   30191:
 dccc7e8c959068e0ac1edaf2d074bf554d07bf17 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/reiserfs/file.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 17a150c3f002..4f77aeb841b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eb582cf1fbd7b9e5f466e3718a59c957e75254e
+refs/heads/master: 9637f28f8b9facff53b00bea6b5d27c9b150b422
diff --git a/trunk/fs/reiserfs/file.c b/trunk/fs/reiserfs/file.c
index cf6e1cf40351..752cea12e30f 100644
--- a/trunk/fs/reiserfs/file.c
+++ b/trunk/fs/reiserfs/file.c
@@ -1560,12 +1560,6 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
 	return res;
 }
 
-static ssize_t reiserfs_aio_write(struct kiocb *iocb, const char __user * buf,
-				  size_t count, loff_t pos)
-{
-	return generic_file_aio_write(iocb, buf, count, pos);
-}
-
 const struct file_operations reiserfs_file_operations = {
 	.read = generic_file_read,
 	.write = reiserfs_file_write,
@@ -1575,7 +1569,7 @@ const struct file_operations reiserfs_file_operations = {
 	.fsync = reiserfs_sync_file,
 	.sendfile = generic_file_sendfile,
 	.aio_read = generic_file_aio_read,
-	.aio_write = reiserfs_aio_write,
+	.aio_write = generic_file_aio_write,
 	.splice_read = generic_file_splice_read,
 	.splice_write = generic_file_splice_write,
 };