-Index: linux-2.6.16.46-0.14/fs/jbd/commit.c
+Index: linux-2.6.16.53-0.16/fs/jbd/commit.c
===================================================================
---- linux-2.6.16.46-0.14.orig/fs/jbd/commit.c
-+++ linux-2.6.16.46-0.14/fs/jbd/commit.c
+--- linux-2.6.16.53-0.16.orig/fs/jbd/commit.c
++++ linux-2.6.16.53-0.16/fs/jbd/commit.c
@@ -22,6 +22,7 @@
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
int barrier_done = 0;
if (is_journal_aborted(journal))
-@@ -118,21 +123,34 @@ static int journal_write_commit_record(j
+@@ -118,21 +123,35 @@ static int journal_write_commit_record(j
bh = jh2bh(descriptor);
- JBUFFER_TRACE(descriptor, "write commit block");
+ JBUFFER_TRACE(descriptor, "submit commit block");
+ lock_buffer(bh);
++ get_bh(bh);
+
set_buffer_dirty(bh);
- if (journal->j_flags & JFS_BARRIER) {
+ bh->b_end_io = journal_end_buffer_io_sync;
+
+ if (journal->j_flags & JFS_BARRIER &&
-+ !JFS_HAS_COMPAT_FEATURE(journal,
++ !JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)) {
+
set_buffer_ordered(bh);
/* is it possible for another commit to fail at roughly
* the same time as this one? If so, we don't want to
* trust the barrier flag in the super, but instead want
-@@ -153,15 +171,74 @@ static int journal_write_commit_record(j
+@@ -153,12 +172,84 @@ static int journal_write_commit_record(j
clear_buffer_ordered(bh);
set_buffer_uptodate(bh);
set_buffer_dirty(bh);
+ journal_put_journal_head(bh2jh(bh));
+
+ return ret;
- }
-
- /*
++}
++
++/*
+ * Wait for all submitted IO to complete.
+ */
+static int journal_wait_on_locked_list(journal_t *journal,
+ return ret;
+}
+
-+
-+/*
- * journal_commit_transaction
- *
- * The primary function for committing a transaction to the log. This
-@@ -184,6 +261,8 @@ void journal_commit_transaction(journal_
++static inline __u32 jbd_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
++{
++ struct page *page = bh->b_page;
++ char *addr;
++ __u32 checksum;
++
++ addr = kmap_atomic(page, KM_USER0);
++ checksum = crc32_be(crc32_sum,
++ (void *)(addr + offset_in_page(bh->b_data)),
++ bh->b_size);
++ kunmap_atomic(addr, KM_USER0);
++ return checksum;
+ }
+
+ /*
+@@ -184,6 +275,8 @@ void journal_commit_transaction(journal_
int first_tag = 0;
int tag_flag;
int i;
/*
* First job: lock down the current transaction and wait for
-@@ -395,37 +474,14 @@ write_out_data:
+@@ -395,37 +488,14 @@ write_out_data:
}
/*
spin_unlock(&journal->j_list_lock);
if (err)
-@@ -598,6 +654,16 @@ write_out_data:
+@@ -598,6 +668,16 @@ write_out_data:
start_journal_io:
for (i = 0; i < bufs; i++) {
struct buffer_head *bh = wbuf[i];
+ */
+ if (JFS_HAS_COMPAT_FEATURE(journal,
+ JFS_FEATURE_COMPAT_CHECKSUM)) {
-+ crc32_sum = crc32_be(crc32_sum,
-+ (void *)bh->b_data,
-+ bh->b_size);
++ crc32_sum =
++ jbd_checksum_data(crc32_sum,
++ bh);
+ }
+
lock_buffer(bh);
clear_buffer_dirty(bh);
set_buffer_uptodate(bh);
-@@ -614,6 +680,23 @@ start_journal_io:
+@@ -614,6 +694,23 @@ start_journal_io:
}
}
/* Lo and behold: we have just managed to send a transaction to
the log. Before we can commit it, wait for the IO so far to
complete. Control buffers being written are on the
-@@ -712,9 +795,15 @@ wait_for_iobuf:
+@@ -712,9 +809,15 @@ wait_for_iobuf:
}
jbd_debug(3, "JBD: commit phase 6\n");
if (err)
__journal_abort_hard(journal);
-Index: linux-2.6.16.46-0.14/include/linux/jbd.h
+Index: linux-2.6.16.53-0.16/include/linux/jbd.h
===================================================================
---- linux-2.6.16.46-0.14.orig/include/linux/jbd.h
-+++ linux-2.6.16.46-0.14/include/linux/jbd.h
+--- linux-2.6.16.53-0.16.orig/include/linux/jbd.h
++++ linux-2.6.16.53-0.16/include/linux/jbd.h
@@ -142,6 +142,29 @@ typedef struct journal_header_s
__be32 h_sequence;
} journal_header_t;
+#define JFS_KNOWN_COMPAT_FEATURES JFS_FEATURE_COMPAT_CHECKSUM
#define JFS_KNOWN_ROCOMPAT_FEATURES 0
-#define JFS_KNOWN_INCOMPAT_FEATURES JFS_FEATURE_INCOMPAT_REVOKE
-+#define JFS_KNOWN_INCOMPAT_FEATURES JFS_FEATURE_INCOMPAT_REVOKE | \
-+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT
++#define JFS_KNOWN_INCOMPAT_FEATURES (JFS_FEATURE_INCOMPAT_REVOKE | \
++ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)
#ifdef __KERNEL__
extern int journal_create (journal_t *);
extern int journal_load (journal_t *journal);
extern void journal_destroy (journal_t *);
-Index: linux-2.6.16.46-0.14/fs/jbd/recovery.c
+Index: linux-2.6.16.53-0.16/fs/jbd/recovery.c
===================================================================
---- linux-2.6.16.46-0.14.orig/fs/jbd/recovery.c
-+++ linux-2.6.16.46-0.14/fs/jbd/recovery.c
+--- linux-2.6.16.53-0.16.orig/fs/jbd/recovery.c
++++ linux-2.6.16.53-0.16/fs/jbd/recovery.c
@@ -21,6 +21,7 @@
#include <linux/jbd.h>
#include <linux/errno.h>
#endif
/*
-@@ -307,6 +308,37 @@ int journal_skip_recovery(journal_t *jou
+@@ -307,6 +308,38 @@ int journal_skip_recovery(journal_t *jou
return err;
}
+ unsigned long *next_log_block, __u32 *crc32_sum)
+{
+ int i, num_blks, err;
-+ unsigned io_block;
++ unsigned long io_block;
+ struct buffer_head *obh;
+
+ num_blks = count_tags(bh, journal->j_blocksize);
+ err = jread(&obh, journal, io_block);
+ if (err) {
+ printk(KERN_ERR "JBD: IO error %d recovering block "
-+ "%u in log\n", err, io_block);
++ "%lu in log\n", err, io_block);
+ return 1;
+ } else {
+ *crc32_sum = crc32_be(*crc32_sum, (void *)obh->b_data,
+ obh->b_size);
+ }
++ put_bh(obh);
+ }
+ return 0;
+}
static int do_one_pass(journal_t *journal,
struct recovery_info *info, enum passtype pass)
{
-@@ -318,6 +350,7 @@ static int do_one_pass(journal_t *journa
+@@ -318,6 +351,7 @@ static int do_one_pass(journal_t *journa
struct buffer_head * bh;
unsigned int sequence;
int blocktype;
/* Precompute the maximum metadata descriptors in a descriptor block */
int MAX_BLOCKS_PER_DESC;
-@@ -409,9 +442,24 @@ static int do_one_pass(journal_t *journa
+@@ -409,9 +443,24 @@ static int do_one_pass(journal_t *journa
switch(blocktype) {
case JFS_DESCRIPTOR_BLOCK:
/* If it is a valid descriptor block, replay it
+ if (calc_chksums(journal, bh,
+ &next_log_block,
+ &crc32_sum)) {
-+ brelse(bh);
++ put_bh(bh);
+ break;
+ }
-+ brelse(bh);
++ put_bh(bh);
+ continue;
+ }
+
next_log_block +=
count_tags(bh, journal->j_blocksize);
wrap(journal, next_log_block);
-@@ -506,9 +554,97 @@ static int do_one_pass(journal_t *journa
+@@ -506,9 +555,97 @@ static int do_one_pass(journal_t *journa
continue;
case JFS_COMMIT_BLOCK:
+ if (chksum_err) {
+ info->end_transaction = next_commit_ID;
+
-+ if (!JFS_HAS_COMPAT_FEATURE(journal,
++ if (!JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)){
+ printk(KERN_ERR
+ "JBD: Transaction %u "
brelse(bh);
next_commit_ID++;
continue;
-@@ -543,9 +679,10 @@ static int do_one_pass(journal_t *journa
+@@ -543,9 +680,10 @@ static int do_one_pass(journal_t *journa
* transaction marks the end of the valid log.
*/
/* It's really bad news if different passes end up at
* different places (but possible due to IO errors). */
if (info->end_transaction != next_commit_ID) {
-Index: linux-2.6.16.46-0.14/fs/jbd/journal.c
+Index: linux-2.6.16.53-0.16/fs/jbd/journal.c
===================================================================
---- linux-2.6.16.46-0.14.orig/fs/jbd/journal.c
-+++ linux-2.6.16.46-0.14/fs/jbd/journal.c
+--- linux-2.6.16.53-0.16.orig/fs/jbd/journal.c
++++ linux-2.6.16.53-0.16/fs/jbd/journal.c
@@ -64,6 +64,7 @@ EXPORT_SYMBOL(journal_update_format);
EXPORT_SYMBOL(journal_check_used_features);
EXPORT_SYMBOL(journal_check_available_features);
/**
* int journal_update_format () - Update on-disk journal structure.
-Index: linux-2.6.16.46-0.14/fs/Kconfig
+Index: linux-2.6.16.53-0.16/fs/Kconfig
===================================================================
---- linux-2.6.16.46-0.14.orig/fs/Kconfig
-+++ linux-2.6.16.46-0.14/fs/Kconfig
+--- linux-2.6.16.53-0.16.orig/fs/Kconfig
++++ linux-2.6.16.53-0.16/fs/Kconfig
@@ -140,6 +140,7 @@ config EXT3_FS_SECURITY
config JBD
help
This is a generic journaling layer for block devices. It is
currently used by the ext3 and OCFS2 file systems, but it could
-Index: linux-2.6.16.46-0.14/Documentation/filesystems/ext3.txt
+Index: linux-2.6.16.53-0.16/Documentation/filesystems/ext3.txt
===================================================================
---- linux-2.6.16.46-0.14.orig/Documentation/filesystems/ext3.txt
-+++ linux-2.6.16.46-0.14/Documentation/filesystems/ext3.txt
+--- linux-2.6.16.53-0.16.orig/Documentation/filesystems/ext3.txt
++++ linux-2.6.16.53-0.16/Documentation/filesystems/ext3.txt
@@ -14,6 +14,16 @@ Options
When mounting an ext3 filesystem, the following option are accepted:
(*) == default