patch-2.3.43 linux/fs/adfs/file.c

Next file: linux/fs/adfs/inode.c
Previous file: linux/fs/adfs/dir_fplus.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/fs/adfs/file.c linux/fs/adfs/file.c
@@ -1,7 +1,7 @@
 /*
  *  linux/fs/adfs/file.c
  *
- * Copyright (C) 1997 Russell King
+ * Copyright (C) 1997-1999 Russell King
  * from:
  *
  *  linux/fs/ext2/file.c
@@ -19,7 +19,7 @@
  *
  *  adfs regular file handling primitives           
  */
-
+#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/ext2_fs.h>
@@ -27,42 +27,21 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 
+#include "adfs.h"
+
 /*
  * We have mostly NULLs here: the current defaults are OK for
  * the adfs filesystem.
  */
 static struct file_operations adfs_file_operations = {
-	NULL,			/* lseek - default	*/
-	generic_file_read,	/* read			*/
-	NULL,			/* write		*/
-	NULL,			/* readdir - bad	*/
-	NULL,			/* select - default	*/
-	NULL,			/* ioctl		*/
-	generic_file_mmap,	/* mmap			*/
-	NULL,			/* open - not special	*/
-	NULL,			/* flush		*/
-	NULL,			/* release		*/
-	file_fsync,		/* fsync		*/
-	NULL,			/* fasync		*/
+	read:		generic_file_read,
+	mmap:		generic_file_mmap,
+	fsync:		file_fsync,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+	write:		generic_file_write,
+#endif
 };
 
 struct inode_operations adfs_file_inode_operations = {
-	&adfs_file_operations,	/* default file operations	*/
-	NULL,			/* create			*/
-	NULL,			/* lookup			*/
-	NULL,			/* link				*/
-	NULL,			/* unlink			*/
-	NULL,			/* symlink			*/
-	NULL,			/* mkdir			*/
-	NULL,			/* rmdir			*/
-	NULL,			/* mknod			*/
-	NULL,			/* rename			*/
-	NULL,			/* readlink			*/
-	NULL,			/* follow_link			*/
-	adfs_bmap,		/* get_block			*/
-	block_read_full_page,	/* readpage			*/
-	NULL,			/* writepage			*/
-	NULL,			/* truncate			*/
-	NULL,			/* permission			*/
-	NULL			/* revalidate			*/
+	&adfs_file_operations,	/* default file operations */
 };

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)