Commit d001e08a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] designated initialisers for ext2

Convert ext2 initialisers to c99 format.  From Art Haas.
parent 991d0dcb
......@@ -655,8 +655,8 @@ int ext2_empty_dir (struct inode * inode)
}
struct file_operations ext2_dir_operations = {
read: generic_read_dir,
readdir: ext2_readdir,
ioctl: ext2_ioctl,
fsync: ext2_sync_file,
.read = generic_read_dir,
.readdir = ext2_readdir,
.ioctl = ext2_ioctl,
.fsync = ext2_sync_file,
};
......@@ -38,17 +38,17 @@ static int ext2_release_file (struct inode * inode, struct file * filp)
* the ext2 filesystem.
*/
struct file_operations ext2_file_operations = {
llseek: generic_file_llseek,
read: generic_file_read,
write: generic_file_write,
ioctl: ext2_ioctl,
mmap: generic_file_mmap,
open: generic_file_open,
release: ext2_release_file,
fsync: ext2_sync_file,
sendfile: generic_file_sendfile,
.llseek = generic_file_llseek,
.read = generic_file_read,
.write = generic_file_write,
.ioctl = ext2_ioctl,
.mmap = generic_file_mmap,
.open = generic_file_open,
.release = ext2_release_file,
.fsync = ext2_sync_file,
.sendfile = generic_file_sendfile,
};
struct inode_operations ext2_file_inode_operations = {
truncate: ext2_truncate,
.truncate = ext2_truncate,
};
......@@ -640,16 +640,16 @@ ext2_writepages(struct address_space *mapping, int *nr_to_write)
}
struct address_space_operations ext2_aops = {
readpage: ext2_readpage,
readpages: ext2_readpages,
writepage: ext2_writepage,
sync_page: block_sync_page,
prepare_write: ext2_prepare_write,
commit_write: generic_commit_write,
bmap: ext2_bmap,
direct_IO: ext2_direct_IO,
writepages: ext2_writepages,
vm_writeback: generic_vm_writeback,
.readpage = ext2_readpage,
.readpages = ext2_readpages,
.writepage = ext2_writepage,
.sync_page = block_sync_page,
.prepare_write = ext2_prepare_write,
.commit_write = generic_commit_write,
.bmap = ext2_bmap,
.direct_IO = ext2_direct_IO,
.writepages = ext2_writepages,
.vm_writeback = generic_vm_writeback,
};
/*
......
......@@ -359,13 +359,13 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
}
struct inode_operations ext2_dir_inode_operations = {
create: ext2_create,
lookup: ext2_lookup,
link: ext2_link,
unlink: ext2_unlink,
symlink: ext2_symlink,
mkdir: ext2_mkdir,
rmdir: ext2_rmdir,
mknod: ext2_mknod,
rename: ext2_rename,
.create = ext2_create,
.lookup = ext2_lookup,
.link = ext2_link,
.unlink = ext2_unlink,
.symlink = ext2_symlink,
.mkdir = ext2_mkdir,
.rmdir = ext2_rmdir,
.mknod = ext2_mknod,
.rename = ext2_rename,
};
......@@ -194,16 +194,16 @@ static void destroy_inodecache(void)
}
static struct super_operations ext2_sops = {
alloc_inode: ext2_alloc_inode,
destroy_inode: ext2_destroy_inode,
read_inode: ext2_read_inode,
write_inode: ext2_write_inode,
put_inode: ext2_put_inode,
delete_inode: ext2_delete_inode,
put_super: ext2_put_super,
write_super: ext2_write_super,
statfs: ext2_statfs,
remount_fs: ext2_remount,
.alloc_inode = ext2_alloc_inode,
.destroy_inode = ext2_destroy_inode,
.read_inode = ext2_read_inode,
.write_inode = ext2_write_inode,
.put_inode = ext2_put_inode,
.delete_inode = ext2_delete_inode,
.put_super = ext2_put_super,
.write_super = ext2_write_super,
.statfs = ext2_statfs,
.remount_fs = ext2_remount,
};
/* Yes, most of these are left as NULL!!
......@@ -213,7 +213,7 @@ static struct super_operations ext2_sops = {
*/
struct dentry *ext2_get_parent(struct dentry *child);
static struct export_operations ext2_export_ops = {
get_parent: ext2_get_parent,
.get_parent = ext2_get_parent,
};
/*
......@@ -874,11 +874,11 @@ static struct super_block *ext2_get_sb(struct file_system_type *fs_type,
}
static struct file_system_type ext2_fs_type = {
owner: THIS_MODULE,
name: "ext2",
get_sb: ext2_get_sb,
kill_sb: kill_block_super,
fs_flags: FS_REQUIRES_DEV,
.owner = THIS_MODULE,
.name = "ext2",
.get_sb = ext2_get_sb,
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};
static int __init init_ext2_fs(void)
......
......@@ -32,6 +32,6 @@ static int ext2_follow_link(struct dentry *dentry, struct nameidata *nd)
}
struct inode_operations ext2_fast_symlink_inode_operations = {
readlink: ext2_readlink,
follow_link: ext2_follow_link,
.readlink = ext2_readlink,
.follow_link = ext2_follow_link,
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment