Merge angband.namesys.com:/home/green/bk/linux-2.5

into angband.namesys.com:/home/green/bk_work/reiser3-linux-2.5

fs/reiserfs/file.c

@@ -141,19 +141,19 @@ static int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) {
 }
 
 struct file_operations reiserfs_file_operations = {
-    read:	generic_file_read,
-    write:	generic_file_write,
-    ioctl:	reiserfs_ioctl,
-    mmap:	generic_file_mmap,
-    release:	reiserfs_file_release,
-    fsync:	reiserfs_sync_file,
-    sendfile:	generic_file_sendfile,
+    .read	= generic_file_read,
+    .write	= generic_file_write,
+    .ioctl	= reiserfs_ioctl,
+    .mmap	= generic_file_mmap,
+    .release	= reiserfs_file_release,
+    .fsync	= reiserfs_sync_file,
+    .sendfile	= generic_file_sendfile,
 };
 
 
 struct  inode_operations reiserfs_file_inode_operations = {
-    truncate:	reiserfs_vfs_truncate_file,
-    setattr:    reiserfs_setattr,
+    .truncate	= reiserfs_vfs_truncate_file,
+    .setattr    = reiserfs_setattr,
 };
 
 

fs/reiserfs/item_ops.c

@@ -111,18 +111,18 @@ static void sd_print_vi (struct virtual_item * vi)
 }
 
 struct item_operations stat_data_ops = {
-	bytes_number:		sd_bytes_number,
-	decrement_key:		sd_decrement_key,
-	is_left_mergeable:	sd_is_left_mergeable,
-	print_item:		sd_print_item,
-	check_item:		sd_check_item,
-
-	create_vi:		sd_create_vi,
-	check_left:		sd_check_left,
-	check_right:		sd_check_right,
-	part_size:		sd_part_size,
-	unit_num:		sd_unit_num,
-	print_vi:		sd_print_vi
+	.bytes_number		= sd_bytes_number,
+	.decrement_key		= sd_decrement_key,
+	.is_left_mergeable	= sd_is_left_mergeable,
+	.print_item		= sd_print_item,
+	.check_item		= sd_check_item,
+
+	.create_vi		= sd_create_vi,
+	.check_left		= sd_check_left,
+	.check_right		= sd_check_right,
+	.part_size		= sd_part_size,
+	.unit_num		= sd_unit_num,
+	.print_vi		= sd_print_vi
 };
 
 
@@ -214,18 +214,18 @@ static void direct_print_vi (struct virtual_item * vi)
 }
 
 struct item_operations direct_ops = {
-	bytes_number:		direct_bytes_number,
-	decrement_key:		direct_decrement_key,
-	is_left_mergeable:	direct_is_left_mergeable,
-	print_item:		direct_print_item,
-	check_item:		direct_check_item,
-
-	create_vi:		direct_create_vi,
-	check_left:		direct_check_left,
-	check_right:		direct_check_right,
-	part_size:		direct_part_size,
-	unit_num:		direct_unit_num,
-	print_vi:		direct_print_vi
+	.bytes_number		= direct_bytes_number,
+	.decrement_key		= direct_decrement_key,
+	.is_left_mergeable	= direct_is_left_mergeable,
+	.print_item		= direct_print_item,
+	.check_item		= direct_check_item,
+
+	.create_vi		= direct_create_vi,
+	.check_left		= direct_check_left,
+	.check_right		= direct_check_right,
+	.part_size		= direct_part_size,
+	.unit_num		= direct_unit_num,
+	.print_vi		= direct_print_vi
 };
 
 
@@ -368,18 +368,18 @@ static void indirect_print_vi (struct virtual_item * vi)
 }
 
 struct item_operations indirect_ops = {
-	bytes_number:		indirect_bytes_number,
-	decrement_key:		indirect_decrement_key,
-	is_left_mergeable:	indirect_is_left_mergeable,
-	print_item:		indirect_print_item,
-	check_item:		indirect_check_item,
-
-	create_vi:		indirect_create_vi,
-	check_left:		indirect_check_left,
-	check_right:		indirect_check_right,
-	part_size:		indirect_part_size,
-	unit_num:		indirect_unit_num,
-	print_vi:		indirect_print_vi
+	.bytes_number		= indirect_bytes_number,
+	.decrement_key		= indirect_decrement_key,
+	.is_left_mergeable	= indirect_is_left_mergeable,
+	.print_item		= indirect_print_item,
+	.check_item		= indirect_check_item,
+
+	.create_vi		= indirect_create_vi,
+	.check_left		= indirect_check_left,
+	.check_right		= indirect_check_right,
+	.part_size		= indirect_part_size,
+	.unit_num		= indirect_unit_num,
+	.print_vi		= indirect_print_vi
 };
 
 
@@ -662,18 +662,18 @@ static void direntry_print_vi (struct virtual_item * vi)
 }
 
 struct item_operations direntry_ops = {
-	bytes_number:		direntry_bytes_number,
-	decrement_key:		direntry_decrement_key,
-	is_left_mergeable:	direntry_is_left_mergeable,
-	print_item:		direntry_print_item,
-	check_item:		direntry_check_item,
-
-	create_vi:		direntry_create_vi,
-	check_left:		direntry_check_left,
-	check_right:		direntry_check_right,
-	part_size:		direntry_part_size,
-	unit_num:		direntry_unit_num,
-	print_vi:		direntry_print_vi
+	.bytes_number		= direntry_bytes_number,
+	.decrement_key		= direntry_decrement_key,
+	.is_left_mergeable	= direntry_is_left_mergeable,
+	.print_item		= direntry_print_item,
+	.check_item		= direntry_check_item,
+
+	.create_vi		= direntry_create_vi,
+	.check_left		= direntry_check_left,
+	.check_right		= direntry_check_right,
+	.part_size		= direntry_part_size,
+	.unit_num		= direntry_unit_num,
+	.print_vi		= direntry_print_vi
 };
 
 

fs/reiserfs/super.c

@@ -1313,11 +1313,11 @@ exit_reiserfs_fs ( void )
 }
 
 static struct file_system_type reiserfs_fs_type = {
-	owner: THIS_MODULE,
-	name: "reiserfs",
-	get_sb: get_super_block,
-	kill_sb: kill_block_super,
-	fs_flags: FS_REQUIRES_DEV,
+	.owner		= THIS_MODULE,
+	.name		= "reiserfs",
+	.get_sb		= get_super_block,
+	.kill_sb	= kill_block_super,
+	.fs_flags	= FS_REQUIRES_DEV,
 };
 
 MODULE_DESCRIPTION ("ReiserFS journaled filesystem");