patch-2.3.48 linux/fs/autofs4/root.c

Next file: linux/fs/bad_inode.c
Previous file: linux/fs/autofs4/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.47/linux/fs/autofs4/root.c linux/fs/autofs4/root.c
@@ -25,33 +25,31 @@
 static int autofs4_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);
 static struct dentry *autofs4_root_lookup(struct inode *,struct dentry *);
 
-static struct file_operations autofs4_root_operations = {
-	readdir:	autofs4_dir_readdir,	/* readdir */
-	ioctl:		autofs4_root_ioctl,	/* ioctl */
+struct file_operations autofs4_root_operations = {
+	read:		generic_read_dir,
+	readdir:	autofs4_dir_readdir,
+	ioctl:		autofs4_root_ioctl,
 };
 
-struct inode_operations autofs4_root_inode_operations = {
-        &autofs4_root_operations,		/* file operations */
-
-	lookup:		autofs4_root_lookup,	/* lookup */
-	unlink:		autofs4_dir_unlink,      /* unlink */
-	symlink:	autofs4_dir_symlink,     /* symlink */
-	mkdir:		autofs4_dir_mkdir,       /* mkdir */
-	rmdir:		autofs4_dir_rmdir,       /* rmdir */
+struct file_operations autofs4_dir_operations = {
+	read:		generic_read_dir,
+	readdir:	autofs4_dir_readdir,
 };
 
-static struct file_operations autofs4_dir_operations = {
-        readdir:	autofs4_dir_readdir,     /* readdir */
+struct inode_operations autofs4_root_inode_operations = {
+	lookup:		autofs4_root_lookup,
+	unlink:		autofs4_dir_unlink,
+	symlink:	autofs4_dir_symlink,
+	mkdir:		autofs4_dir_mkdir,
+	rmdir:		autofs4_dir_rmdir,
 };
 
 struct inode_operations autofs4_dir_inode_operations = {
-        &autofs4_dir_operations, /* file operations */
-
-	lookup:		autofs4_dir_lookup,	/* lookup */
-        unlink:		autofs4_dir_unlink,      /* unlink */
-        symlink:	autofs4_dir_symlink,     /* symlink */
-        mkdir:		autofs4_dir_mkdir,       /* mkdir */
-        rmdir:		autofs4_dir_rmdir,       /* rmdir */
+	lookup:		autofs4_dir_lookup,
+	unlink:		autofs4_dir_unlink,
+	symlink:	autofs4_dir_symlink,
+	mkdir:		autofs4_dir_mkdir,
+	rmdir:		autofs4_dir_rmdir,
 };
 
 static inline struct dentry *nth_child(struct dentry *dir, int nr)

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