diff options
| author | Linus Torvalds <[email protected]> | 2007-09-10 14:36:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-09-10 14:36:37 -0700 |
| commit | 3c038f97e4b14c322b49f13578e0714e1a2ece53 (patch) | |
| tree | c6d1370339a47fbc89c1913f6a8683f257ef3ef4 /fs/xfs/linux-2.6/xfs_globals.c | |
| parent | 83dc3d43ce06d3466f48046577331d06a40b8344 (diff) | |
| parent | 5995cb7d805496362e5af73235145667096fbc6f (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] fix nasty quota hashtable allocation bug
[XFS] fix sparse shadowed variable warnings
[XFS] fix ASSERT and ASSERT_ALWAYS
[XFS] Fix sparse warning in kmem_shake_allow
[XFS] Fix sparse NULL vs 0 warnings
[XFS] Set filestreams object timeout to something sane.
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_globals.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_globals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c index bb72c3d4141f..81565dea9af7 100644 --- a/fs/xfs/linux-2.6/xfs_globals.c +++ b/fs/xfs/linux-2.6/xfs_globals.c @@ -46,7 +46,7 @@ xfs_param_t xfs_params = { .inherit_nosym = { 0, 0, 1 }, .rotorstep = { 1, 1, 255 }, .inherit_nodfrg = { 0, 1, 1 }, - .fstrm_timer = { 1, 50, 3600*100}, + .fstrm_timer = { 1, 30*100, 3600*100}, }; /* |