Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[firefly-linux-kernel-4.4.55.git] / fs / xfs / linux-2.6 / xfs_globals.c

diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c
index 6c162c3dde7efb44ee4f1abbb430591974244b82..81565dea9af7ca9f119a69ebc2f32a62edc318df 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_globals.c
+++ b/fs/xfs/linux-2.6/xfs_globals.c
@@ -34,7 +34,7 @@ xfs_param_t xfs_params = {
        .restrict_chown = {     0,              1,              1       },
        .sgid_inherit   = {     0,              0,              1       },
        .symlink_mode   = {     0,              0,              1       },
-       .panic_mask     = {     0,              0,              127     },
+       .panic_mask     = {     0,              0,              255     },
        .error_level    = {     0,              3,              11      },
        .syncd_timer    = {     1*100,          30*100,         7200*100},
        .stats_clear    = {     0,              0,              1       },
@@ -46,6 +46,7 @@ xfs_param_t xfs_params = {
        .inherit_nosym  = {     0,              0,              1       },
        .rotorstep      = {     1,              1,              255     },
        .inherit_nodfrg = {     0,              1,              1       },
+       .fstrm_timer    = {     1,              30*100,         3600*100},
 };
 
 /*