fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_sysctl.c

diff --git a/fs/xfs/linux-2.6/xfs_sysctl.c b/fs/xfs/linux-2.6/xfs_sysctl.c
index 6c39207..af24653 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_sysctl.c
+++ b/fs/xfs/linux-2.6/xfs_sysctl.c
@@ -38,8 +38,7 @@ xfs_stats_clear_proc_handler(
 
        if (!ret && write && *valp) {
                printk("XFS Clearing xfsstats\n");
-               for (c = 0; c < NR_CPUS; c++) {
-                       if (!cpu_possible(c)) continue;
+               for_each_possible_cpu(c) {
                        preempt_disable();
                        /* save vn_active, it's a universal truth! */
                        vn_active = per_cpu(xfsstats, c).vn_active;
@@ -58,74 +57,79 @@ xfs_stats_clear_proc_handler(
 STATIC ctl_table xfs_table[] = {
        {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
 
        {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
 
        {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
 
        {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
 
        {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.error_level.min, &xfs_params.error_level.max},
 
        {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max},
 
        {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
 
        {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
 
        {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
 
        {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max},
 
        {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max},
 
        {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max},
 
        {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val,
        sizeof(int), 0644, NULL, &proc_dointvec_minmax,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
 
+       {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val,
+       sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+       &sysctl_intvec, NULL,
+       &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max},
+
        /* please keep this the last entry */
 #ifdef CONFIG_PROC_FS
        {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
        sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
-       NULL, &sysctl_intvec, NULL,
+       &sysctl_intvec, NULL,
        &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
 #endif /* CONFIG_PROC_FS */