Merge bk://ncpfs.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

fs/ncpfs/dir.c

@@ -51,22 +51,22 @@ extern int ncp_symlink(struct inode *, struct dentry *, const char *);
 		      
 struct file_operations ncp_dir_operations =
 {
-	read:		generic_read_dir,
-	readdir:	ncp_readdir,
-	ioctl:		ncp_ioctl,
+	.read		= generic_read_dir,
+	.readdir	= ncp_readdir,
+	.ioctl		= ncp_ioctl,
 };
 
 struct inode_operations ncp_dir_inode_operations =
 {
-	create:		ncp_create,
-	lookup:		ncp_lookup,
-	unlink:		ncp_unlink,
-	symlink:	ncp_symlink,
-	mkdir:		ncp_mkdir,
-	rmdir:		ncp_rmdir,
-	mknod:		ncp_mknod,
-	rename:		ncp_rename,
-	setattr:	ncp_notify_change,
+	.create		= ncp_create,
+	.lookup		= ncp_lookup,
+	.unlink		= ncp_unlink,
+	.symlink	= ncp_symlink,
+	.mkdir		= ncp_mkdir,
+	.rmdir		= ncp_rmdir,
+	.mknod		= ncp_mknod,
+	.rename		= ncp_rename,
+	.setattr	= ncp_notify_change,
 };
 
 /*
@@ -79,17 +79,17 @@ static int ncp_delete_dentry(struct dentry *);
 
 static struct dentry_operations ncp_dentry_operations =
 {
-	d_revalidate:	ncp_lookup_validate,
-	d_hash:		ncp_hash_dentry,
-	d_compare:	ncp_compare_dentry,
-	d_delete:	ncp_delete_dentry,
+	.d_revalidate	= ncp_lookup_validate,
+	.d_hash		= ncp_hash_dentry,
+	.d_compare	= ncp_compare_dentry,
+	.d_delete	= ncp_delete_dentry,
 };
 
 struct dentry_operations ncp_root_dentry_operations =
 {
-	d_hash:		ncp_hash_dentry,
-	d_compare:	ncp_compare_dentry,
-	d_delete:	ncp_delete_dentry,
+	.d_hash		= ncp_hash_dentry,
+	.d_compare	= ncp_compare_dentry,
+	.d_delete	= ncp_delete_dentry,
 };
 
 

fs/ncpfs/file.c

@@ -296,16 +296,16 @@ static int ncp_release(struct inode *inode, struct file *file) {
 
 struct file_operations ncp_file_operations =
 {
-	llseek:		remote_llseek,
-	read:		ncp_file_read,
-	write:		ncp_file_write,
-	ioctl:		ncp_ioctl,
-	mmap:		ncp_mmap,
-	release:	ncp_release,
-	fsync:		ncp_fsync,
+	.llseek		= remote_llseek,
+	.read		= ncp_file_read,
+	.write		= ncp_file_write,
+	.ioctl		= ncp_ioctl,
+	.mmap		= ncp_mmap,
+	.release	= ncp_release,
+	.fsync		= ncp_fsync,
 };
 
 struct inode_operations ncp_file_inode_operations =
 {
-	setattr:	ncp_notify_change,
+	.setattr	= ncp_notify_change,
 };

fs/ncpfs/inode.c

@@ -83,12 +83,12 @@ static void destroy_inodecache(void)
 
 static struct super_operations ncp_sops =
 {
-	alloc_inode:	ncp_alloc_inode,
-	destroy_inode:	ncp_destroy_inode,
-	drop_inode:	generic_delete_inode,
-	delete_inode:	ncp_delete_inode,
-	put_super:	ncp_put_super,
-	statfs:		ncp_statfs,
+	.alloc_inode	= ncp_alloc_inode,
+	.destroy_inode	= ncp_destroy_inode,
+	.drop_inode	= generic_delete_inode,
+	.delete_inode	= ncp_delete_inode,
+	.put_super	= ncp_put_super,
+	.statfs		= ncp_statfs,
 };
 
 extern struct dentry_operations ncp_root_dentry_operations;
@@ -792,10 +792,10 @@ static struct super_block *ncp_get_sb(struct file_system_type *fs_type,
 }
 
 static struct file_system_type ncp_fs_type = {
-	owner:		THIS_MODULE,
-	name:		"ncpfs",
-	get_sb:		ncp_get_sb,
-	kill_sb:	kill_anon_super,
+	.owner		= THIS_MODULE,
+	.name		= "ncpfs",
+	.get_sb		= ncp_get_sb,
+	.kill_sb	= kill_anon_super,
 };
 
 static int __init init_ncp_fs(void)