diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 15:30:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 15:30:53 -0700 |
| commit | 5f0e62c3e1db9acb35b750e02cddc1fcb8cfd52b (patch) | |
| tree | 2c0b507ed89a97116cc595e090ebaeb1439df865 /include/linux | |
| parent | aab2545fdd6641b76af0ae96456c4ca9d1e50dad (diff) | |
| parent | 571640cad3fda6475da45d91cf86076f1f86bd9b (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: enable barriers by default
jbd2: Fix barrier fallback code to re-lock the buffer head
ext4: Display the journal_async_commit mount option in /proc/mounts
jbd2: If a journal checksum error is detected, propagate the error to ext4
jbd2: Fix memory leak when verifying checksums in the journal
ext4: fix online resize bug
ext4: Fix uninit block group initialization with FLEX_BG
ext4: Fix use of uninitialized data with debug enabled.
Diffstat (limited to 'include/linux')
| -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 05e2b307161..d147f0f9036 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -919,6 +919,9 @@ struct journal_s struct proc_dir_entry *j_proc_entry; struct transaction_stats_s j_stats; + /* Failed journal commit ID */ + unsigned int j_failed_commit; + /* * An opaque pointer to fs-private information. ext3 puts its * superblock pointer here |