[PATCH] C99 initializers for mm

ISO C99 designated initializers by Art Haas for mm.

diff --git a/mm/filemap.c b/mm/filemap.c
index 52ffe553927c5ce4a71c37102c76d03b71411c24..2e84aab174124c6ee1bf5d88874aab865e5a817f 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1346,7 +1346,7 @@ page_not_uptodate:
 }
 
 static struct vm_operations_struct generic_file_vm_ops = {
-       nopage:         filemap_nopage,
+       .nopage         = filemap_nopage,
 };
 
 /* This is used for a general mmap of a disk file */

diff --git a/mm/numa.c b/mm/numa.c
index b18eea382b6abfd76a07bc4744099f610d368534..a7605cdae51bc922cea3298bea27dd4469a4b022 100644 (file)
--- a/mm/numa.c
+++ b/mm/numa.c
@@ -12,7 +12,7 @@
 int numnodes = 1;      /* Initialized for UMA platforms */
 
 static bootmem_data_t contig_bootmem_data;
-pg_data_t contig_page_data = { bdata: &contig_bootmem_data };
+pg_data_t contig_page_data = { .bdata = &contig_bootmem_data };
 
 #ifndef CONFIG_DISCONTIGMEM
 

diff --git a/mm/page_io.c b/mm/page_io.c
index 5ecf8adba19642522d1a747722a33b555bf46307..e42e33511a098d9397ac90db0afafb453a8b0502 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -132,11 +132,11 @@ static int swap_vm_writeback(struct page *page, int *nr_to_write)
 }
 
 struct address_space_operations swap_aops = {
-       vm_writeback:   swap_vm_writeback,
-       writepage:      swap_writepage,
-       readpage:       swap_readpage,
-       sync_page:      block_sync_page,
-       set_page_dirty: __set_page_dirty_nobuffers,
+       .vm_writeback   = swap_vm_writeback,
+       .writepage      = swap_writepage,
+       .readpage       = swap_readpage,
+       .sync_page      = block_sync_page,
+       .set_page_dirty = __set_page_dirty_nobuffers,
 };
 
 /*

diff --git a/mm/readahead.c b/mm/readahead.c
index e1f471b9be5c7c00cb37a8f438c09c0ea5843f4c..194f56db2ae47542a40271698d9866ee9cfec3ac 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -14,8 +14,8 @@
 #include <linux/backing-dev.h>
 
 struct backing_dev_info default_backing_dev_info = {
-       ra_pages:       (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE,
-       state:          0,
+       .ra_pages       = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE,
+       .state          = 0,
 };
 
 /*

diff --git a/mm/shmem.c b/mm/shmem.c
index c2cd99b6f9539802e0dac4fa702dbc03b7b4a218..abb0685049e2c3cb6b6d9e5af3cd2575c75fc1f3 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1312,14 +1312,14 @@ static int shmem_follow_link(struct dentry *dentry, struct nameidata *nd)
 }
 
 static struct inode_operations shmem_symlink_inline_operations = {
-       readlink:       shmem_readlink_inline,
-       follow_link:    shmem_follow_link_inline,
+       .readlink       = shmem_readlink_inline,
+       .follow_link    = shmem_follow_link_inline,
 };
 
 static struct inode_operations shmem_symlink_inode_operations = {
-       truncate:       shmem_truncate,
-       readlink:       shmem_readlink,
-       follow_link:    shmem_follow_link,
+       .truncate       = shmem_truncate,
+       .readlink       = shmem_readlink,
+       .follow_link    = shmem_follow_link,
 };
 
 static int shmem_parse_options(char *options, int *mode, uid_t *uid, gid_t *gid, unsigned long * blocks, unsigned long *inodes)
@@ -1520,52 +1520,52 @@ static void destroy_inodecache(void)
 }
 
 static struct address_space_operations shmem_aops = {
-       writepage:      shmem_writepage,
-       set_page_dirty: __set_page_dirty_nobuffers,
+       .writepage      = shmem_writepage,
+       .set_page_dirty = __set_page_dirty_nobuffers,
 };
 
 static struct file_operations shmem_file_operations = {
-       mmap:   shmem_mmap,
+       .mmap           = shmem_mmap,
 #ifdef CONFIG_TMPFS
-       read:   shmem_file_read,
-       write:  shmem_file_write,
-       fsync:  shmem_sync_file,
+       .read           = shmem_file_read,
+       .write          = shmem_file_write,
+       .fsync          = shmem_sync_file,
 #endif
 };
 
 static struct inode_operations shmem_inode_operations = {
-       truncate:       shmem_truncate,
-       setattr:        shmem_notify_change,
+       .truncate       = shmem_truncate,
+       .setattr        = shmem_notify_change,
 };
 
 static struct inode_operations shmem_dir_inode_operations = {
 #ifdef CONFIG_TMPFS
-       create:         shmem_create,
-       lookup:         simple_lookup,
-       link:           shmem_link,
-       unlink:         shmem_unlink,
-       symlink:        shmem_symlink,
-       mkdir:          shmem_mkdir,
-       rmdir:          shmem_rmdir,
-       mknod:          shmem_mknod,
-       rename:         shmem_rename,
+       .create         = shmem_create,
+       .lookup         = simple_lookup,
+       .link           = shmem_link,
+       .unlink         = shmem_unlink,
+       .symlink        = shmem_symlink,
+       .mkdir          = shmem_mkdir,
+       .rmdir          = shmem_rmdir,
+       .mknod          = shmem_mknod,
+       .rename         = shmem_rename,
 #endif
 };
 
 static struct super_operations shmem_ops = {
-       alloc_inode:    shmem_alloc_inode,
-       destroy_inode:  shmem_destroy_inode,
+       .alloc_inode    = shmem_alloc_inode,
+       .destroy_inode  = shmem_destroy_inode,
 #ifdef CONFIG_TMPFS
-       statfs:         shmem_statfs,
-       remount_fs:     shmem_remount_fs,
+       .statfs         = shmem_statfs,
+       .remount_fs     = shmem_remount_fs,
 #endif
-       delete_inode:   shmem_delete_inode,
-       drop_inode:     generic_delete_inode,
-       put_super:      shmem_put_super,
+       .delete_inode   = shmem_delete_inode,
+       .drop_inode     = generic_delete_inode,
+       .put_super      = shmem_put_super,
 };
 
 static struct vm_operations_struct shmem_vm_ops = {
-       nopage: shmem_nopage,
+       .nopage         = shmem_nopage,
 };
 
 static struct super_block *shmem_get_sb(struct file_system_type *fs_type,
@@ -1577,17 +1577,17 @@ static struct super_block *shmem_get_sb(struct file_system_type *fs_type,
 #ifdef CONFIG_TMPFS
 /* type "shm" will be tagged obsolete in 2.5 */
 static struct file_system_type shmem_fs_type = {
-       owner:          THIS_MODULE,
-       name:           "shmem",
-       get_sb:         shmem_get_sb,
-       kill_sb:        kill_litter_super,
+       .owner          = THIS_MODULE,
+       .name           = "shmem",
+       .get_sb         = shmem_get_sb,
+       .kill_sb        = kill_litter_super,
 };
 #endif
 static struct file_system_type tmpfs_fs_type = {
-       owner:          THIS_MODULE,
-       name:           "tmpfs",
-       get_sb:         shmem_get_sb,
-       kill_sb:        kill_litter_super,
+       .owner          = THIS_MODULE,
+       .name           = "tmpfs",
+       .get_sb         = shmem_get_sb,
+       .kill_sb        = kill_litter_super,
 };
 static struct vfsmount *shm_mnt;
 

diff --git a/mm/slab.c b/mm/slab.c
index af2e657d54d4c8db4b03787fb9c7a2e706a9ca1d..c35c347a094ea73cad5d61fe4eadaf57e1b92bb3 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -384,14 +384,14 @@ static struct {
 
 /* internal cache of cache description objs */
 static kmem_cache_t cache_cache = {
-       slabs_full:     LIST_HEAD_INIT(cache_cache.slabs_full),
-       slabs_partial:  LIST_HEAD_INIT(cache_cache.slabs_partial),
-       slabs_free:     LIST_HEAD_INIT(cache_cache.slabs_free),
-       objsize:        sizeof(kmem_cache_t),
-       flags:          SLAB_NO_REAP,
-       spinlock:       SPIN_LOCK_UNLOCKED,
-       colour_off:     L1_CACHE_BYTES,
-       name:           "kmem_cache",
+       .slabs_full     = LIST_HEAD_INIT(cache_cache.slabs_full),
+       .slabs_partial  = LIST_HEAD_INIT(cache_cache.slabs_partial),
+       .slabs_free     = LIST_HEAD_INIT(cache_cache.slabs_free),
+       .objsize        = sizeof(kmem_cache_t),
+       .flags          = SLAB_NO_REAP,
+       .spinlock       = SPIN_LOCK_UNLOCKED,
+       .colour_off     = L1_CACHE_BYTES,
+       .name           = "kmem_cache",
 };
 
 /* Guard access to the cache-chain. */
@@ -2053,10 +2053,10 @@ static int s_show(struct seq_file *m, void *p)
  */
 
 struct seq_operations slabinfo_op = {
-       start:  s_start,
-       next:   s_next,
-       stop:   s_stop,
-       show:   s_show
+       .start  = s_start,
+       .next   = s_next,
+       .stop   = s_stop,
+       .show   = s_show,
 };
 
 #define MAX_SLABINFO_WRITE 128

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 2069d022595cf5c6ddd2833fd575892c6c25c3a8..a9856bced9190e4d0e99adb466cb356b1011de1b 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -22,23 +22,23 @@
  * avoid some special-casing in other parts of the kernel.
  */
 static struct inode swapper_inode = {
-       i_mapping:      &swapper_space,
+       .i_mapping      = &swapper_space,
 };
 
 extern struct address_space_operations swap_aops;
 
 struct address_space swapper_space = {
-       page_tree:      RADIX_TREE_INIT(GFP_ATOMIC),
-       page_lock:      RW_LOCK_UNLOCKED,
-       clean_pages:    LIST_HEAD_INIT(swapper_space.clean_pages),
-       dirty_pages:    LIST_HEAD_INIT(swapper_space.dirty_pages),
-       io_pages:       LIST_HEAD_INIT(swapper_space.io_pages),
-       locked_pages:   LIST_HEAD_INIT(swapper_space.locked_pages),
-       host:           &swapper_inode,
-       a_ops:          &swap_aops,
-       i_shared_lock:  SPIN_LOCK_UNLOCKED,
-       private_lock:   SPIN_LOCK_UNLOCKED,
-       private_list:   LIST_HEAD_INIT(swapper_space.private_list),
+       .page_tree      = RADIX_TREE_INIT(GFP_ATOMIC),
+       .page_lock      = RW_LOCK_UNLOCKED,
+       .clean_pages    = LIST_HEAD_INIT(swapper_space.clean_pages),
+       .dirty_pages    = LIST_HEAD_INIT(swapper_space.dirty_pages),
+       .io_pages       = LIST_HEAD_INIT(swapper_space.io_pages),
+       .locked_pages   = LIST_HEAD_INIT(swapper_space.locked_pages),
+       .host           = &swapper_inode,
+       .a_ops          = &swap_aops,
+       .i_shared_lock  = SPIN_LOCK_UNLOCKED,
+       .private_lock   = SPIN_LOCK_UNLOCKED,
+       .private_list   = LIST_HEAD_INIT(swapper_space.private_list),
 };
 
 #define INC_CACHE_INFO(x)      do { swap_cache_info.x++; } while (0)