diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /fs/ext4/ext4_sb.h | |
| parent | trace: clean up funny line breaks in stat_seq_show (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | linux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz linux-99cd7074891f87c49660e3b2880564324a4733ac.zip | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'fs/ext4/ext4_sb.h')
| -rw-r--r-- | fs/ext4/ext4_sb.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/ext4_sb.h b/fs/ext4/ext4_sb.h index b21f16713db0..039b6ea1a042 100644 --- a/fs/ext4/ext4_sb.h +++ b/fs/ext4/ext4_sb.h @@ -57,6 +57,7 @@ struct ext4_sb_info { u32 s_next_generation; u32 s_hash_seed[4]; int s_def_hash_version; + int s_hash_unsigned; /* 3 if hash should be signed, 0 if not */ struct percpu_counter s_freeblocks_counter; struct percpu_counter s_freeinodes_counter; struct percpu_counter s_dirs_counter; @@ -73,6 +74,8 @@ struct ext4_sb_info { struct journal_s *s_journal; struct list_head s_orphan; unsigned long s_commit_interval; + u32 s_max_batch_time; + u32 s_min_batch_time; struct block_device *journal_bdev; #ifdef CONFIG_JBD2_DEBUG struct timer_list turn_ro_timer; /* For turning read-only (crash simulation) */ @@ -101,7 +104,8 @@ struct ext4_sb_info { spinlock_t s_reserve_lock; spinlock_t s_md_lock; tid_t s_last_transaction; - unsigned short *s_mb_offsets, *s_mb_maxs; + unsigned short *s_mb_offsets; + unsigned int *s_mb_maxs; /* tunables */ unsigned long s_stripe; |