diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
| commit | c444debaaa22011b4a84e58e5333575b3f800a33 (patch) | |
| tree | 896a9589aa9e701896da7ea1ae6a24cb04495b8f /include/linux/jbd2.h | |
| parent | 70ef6d595b6e51618a0cbe44b848d8c9db11a010 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/linux/jbd2.h')
| -rw-r--r-- | include/linux/jbd2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 05e2b307161a..d147f0f90360 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
| @@ -919,6 +919,9 @@ struct journal_s | |||
| 919 | struct proc_dir_entry *j_proc_entry; | 919 | struct proc_dir_entry *j_proc_entry; |
| 920 | struct transaction_stats_s j_stats; | 920 | struct transaction_stats_s j_stats; |
| 921 | 921 | ||
| 922 | /* Failed journal commit ID */ | ||
| 923 | unsigned int j_failed_commit; | ||
| 924 | |||
| 922 | /* | 925 | /* |
| 923 | * An opaque pointer to fs-private information. ext3 puts its | 926 | * An opaque pointer to fs-private information. ext3 puts its |
| 924 | * superblock pointer here | 927 | * superblock pointer here |