dirty fix to merging

1 files changed, 37 insertions, 0 deletions

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
new file mode 100644
index 00000000..a36da538
--- /dev/null
+++ b/fs/adfs/file.c
@@ -0,0 +1,37 @@
+/*
+ *  linux/fs/adfs/file.c
+ *
+ * Copyright (C) 1997-1999 Russell King
+ * from:
+ *
+ *  linux/fs/ext2/file.c
+ *
+ * Copyright (C) 1992, 1993, 1994, 1995
+ * Remy Card (card@masi.ibp.fr)
+ * Laboratoire MASI - Institut Blaise Pascal
+ * Universite Pierre et Marie Curie (Paris VI)
+ *
+ *  from
+ *
+ *  linux/fs/minix/file.c
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ *
+ *  adfs regular file handling primitives           
+ */
+#include "adfs.h"
+
+const struct file_operations adfs_file_operations = {
+	.llseek		= generic_file_llseek,
+	.read		= do_sync_read,
+	.aio_read	= generic_file_aio_read,
+	.mmap		= generic_file_mmap,
+	.fsync		= generic_file_fsync,
+	.write		= do_sync_write,
+	.aio_write	= generic_file_aio_write,
+	.splice_read	= generic_file_splice_read,
+};
+
+const struct inode_operations adfs_file_inode_operations = {
+	.setattr	= adfs_notify_change,
+};