Merge with 2.3.48.

4 files changed, 20 insertions, 23 deletions

diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h
index 731f9168f..51305918b 100644
--- a/fs/autofs/autofs_i.h
+++ b/fs/autofs/autofs_i.h
@@ -140,6 +140,8 @@ struct autofs_dir_ent *autofs_expire(struct super_block *,struct autofs_sb_info
 extern struct inode_operations autofs_root_inode_operations;
 extern struct inode_operations autofs_symlink_inode_operations;
 extern struct inode_operations autofs_dir_inode_operations;
+extern struct file_operations autofs_root_operations;
+extern struct file_operations autofs_dir_operations;
 
 /* Initializing function */
 
diff --git a/fs/autofs/dir.c b/fs/autofs/dir.c
index a62fd6c54..b71c3a819 100644
--- a/fs/autofs/dir.c
+++ b/fs/autofs/dir.c
@@ -42,13 +42,12 @@ static struct dentry *autofs_dir_lookup(struct inode *dir,struct dentry *dentry)
 	return NULL;
 }
 
-static struct file_operations autofs_dir_operations = {
+struct file_operations autofs_dir_operations = {
+	read:		generic_read_dir,
 	readdir:	autofs_dir_readdir,
 };
 
 struct inode_operations autofs_dir_inode_operations = {
-	&autofs_dir_operations,	/* file operations */
-	NULL,			/* create */
-	autofs_dir_lookup,	/* lookup */
+	lookup:		autofs_dir_lookup,
 };
 
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 77844cf0e..a67ca9822 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -60,15 +60,12 @@ static void autofs_read_inode(struct inode *inode);
 static void autofs_write_inode(struct inode *inode);
 
 static struct super_operations autofs_sops = {
-	autofs_read_inode,
-	autofs_write_inode,
-	autofs_put_inode,
-	autofs_delete_inode,
-	NULL,			/* notify_change */
-	autofs_put_super,
-	NULL,			/* write_super */
-	autofs_statfs,
-	NULL
+	read_inode:	autofs_read_inode,
+	write_inode:	autofs_write_inode,
+	put_inode:	autofs_put_inode,
+	delete_inode:	autofs_delete_inode,
+	put_super:	autofs_put_super,
+	statfs:		autofs_statfs,
 };
 
 static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid_t *pgrp, int *minproto, int *maxproto)
@@ -300,8 +297,8 @@ static void autofs_read_inode(struct inode *inode)
 
 	/* Initialize to the default case (stub directory) */
 
-	inode->i_op = NULL;
 	inode->i_op = &autofs_dir_inode_operations;
+	inode->i_fop = &autofs_dir_operations;
 	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
 	inode->i_nlink = 2;
 	inode->i_size = 0;
@@ -312,6 +309,7 @@ static void autofs_read_inode(struct inode *inode)
 	if ( ino == AUTOFS_ROOT_INO ) {
 		inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
 		inode->i_op = &autofs_root_inode_operations;
+		inode->i_fop = &autofs_root_operations;
 		inode->i_uid = inode->i_gid = 0; /* Changed in read_super */
 		return;
 	} 
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index e2c03ff34..ea517f0b1 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -23,20 +23,18 @@ static int autofs_root_rmdir(struct inode *,struct dentry *);
 static int autofs_root_mkdir(struct inode *,struct dentry *,int);
 static int autofs_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);
 
-static struct file_operations autofs_root_operations = {
+struct file_operations autofs_root_operations = {
+	read:		generic_read_dir,
 	readdir:	autofs_root_readdir,
 	ioctl:		autofs_root_ioctl,
 };
 
 struct inode_operations autofs_root_inode_operations = {
-        &autofs_root_operations, /* file operations */
-        NULL,                   /* create */
-        autofs_root_lookup,     /* lookup */
-        NULL,                   /* link */
-        autofs_root_unlink,     /* unlink */
-        autofs_root_symlink,    /* symlink */
-        autofs_root_mkdir,      /* mkdir */
-        autofs_root_rmdir,      /* rmdir */
+        lookup:		autofs_root_lookup,
+        unlink:		autofs_root_unlink,
+        symlink:	autofs_root_symlink,
+        mkdir:		autofs_root_mkdir,
+        rmdir:		autofs_root_rmdir,
 };
 
 static int autofs_root_readdir(struct file *filp, void *dirent, filldir_t filldir)