Commit 6be13f9a authored by Art Haas's avatar Art Haas Committed by James Bottomley

[PATCH] C99 patches for fs/

Add C99 initializers to fs/bio.c and fs/dquot.c.  And fs/libfs.c had an
obsolete GCC style initialzers that is converted to C99 style.
parent ec55bbd7
...@@ -53,7 +53,7 @@ struct biovec_pool { ...@@ -53,7 +53,7 @@ struct biovec_pool {
* unsigned short * unsigned short
*/ */
#define BV(x) { x, "biovec-" #x } #define BV(x) { .nr_vecs = x, .name = "biovec-" #x }
static struct biovec_pool bvec_array[BIOVEC_NR_POOLS] = { static struct biovec_pool bvec_array[BIOVEC_NR_POOLS] = {
BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES), BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES),
}; };
......
...@@ -1348,25 +1348,91 @@ struct quotactl_ops vfs_quotactl_ops = { ...@@ -1348,25 +1348,91 @@ struct quotactl_ops vfs_quotactl_ops = {
}; };
static ctl_table fs_dqstats_table[] = { static ctl_table fs_dqstats_table[] = {
{FS_DQ_LOOKUPS, "lookups", &dqstats.lookups, sizeof(int), 0444, NULL, &proc_dointvec}, {
{FS_DQ_DROPS, "drops", &dqstats.drops, sizeof(int), 0444, NULL, &proc_dointvec}, .ctl_name = FS_DQ_LOOKUPS,
{FS_DQ_READS, "reads", &dqstats.reads, sizeof(int), 0444, NULL, &proc_dointvec}, .procname = "lookups",
{FS_DQ_WRITES, "writes", &dqstats.writes, sizeof(int), 0444, NULL, &proc_dointvec}, .data = &dqstats.lookups,
{FS_DQ_CACHE_HITS, "cache_hits", &dqstats.cache_hits, sizeof(int), 0444, NULL, &proc_dointvec}, .maxlen = sizeof(int),
{FS_DQ_ALLOCATED, "allocated_dquots", &dqstats.allocated_dquots, sizeof(int), 0444, NULL, &proc_dointvec}, .mode = 0444,
{FS_DQ_FREE, "free_dquots", &dqstats.free_dquots, sizeof(int), 0444, NULL, &proc_dointvec}, .proc_handler = &proc_dointvec,
{FS_DQ_SYNCS, "syncs", &dqstats.syncs, sizeof(int), 0444, NULL, &proc_dointvec}, },
{}, {
.ctl_name = FS_DQ_DROPS,
.procname = "drops",
.data = &dqstats.drops,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_READS,
.procname = "reads",
.data = &dqstats.reads,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_WRITES,
.procname = "writes",
.data = &dqstats.writes,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_CACHE_HITS,
.procname = "cache_hits",
.data = &dqstats.cache_hits,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_ALLOCATED,
.procname = "allocated_dquots",
.data = &dqstats.allocated_dquots,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_FREE,
.procname = "free_dquots",
.data = &dqstats.free_dquots,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = FS_DQ_SYNCS,
.procname = "syncs",
.data = &dqstats.syncs,
.maxlen = sizeof(int),
.mode = 0444,
.proc_handler = &proc_dointvec,
},
{ .ctl_name = 0 },
}; };
static ctl_table fs_table[] = { static ctl_table fs_table[] = {
{FS_DQSTATS, "quota", NULL, 0, 0555, fs_dqstats_table}, {
{}, .ctl_name = FS_DQSTATS,
.procname = "quota",
.mode = 0555,
.child = fs_dqstats_table,
},
{ .ctl_name = 0 },
}; };
static ctl_table sys_table[] = { static ctl_table sys_table[] = {
{CTL_FS, "fs", NULL, 0, 0555, fs_table}, {
{}, .ctl_name = CTL_FS,
.procname = "fs",
.mode = 0555,
.child = fs_table,
},
{ .ctl_name = 0 },
}; };
/* SLAB cache for dquot structures */ /* SLAB cache for dquot structures */
......
...@@ -336,7 +336,7 @@ int simple_commit_write(struct file *file, struct page *page, ...@@ -336,7 +336,7 @@ int simple_commit_write(struct file *file, struct page *page,
int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files) int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)
{ {
static struct super_operations s_ops = {statfs:simple_statfs}; static struct super_operations s_ops = {.statfs = simple_statfs};
struct inode *inode; struct inode *inode;
struct dentry *root; struct dentry *root;
struct dentry *dentry; struct dentry *dentry;
......
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