X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fjbd-journal-chksum-2.6.18-vanilla.patch;h=7cb1b153f5908f99fc0c97642055cad2b32dbd41;hb=983df04a97067b80f2282f0deca43bae09c68748;hp=b2825e2a3ecfa0fac2bb99f94bbb45bccff3be5b;hpb=5a9ff028b6f95cb0803abb6ea726c357ff8328ae;p=fs%2Flustre-release.git diff --git a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch index b2825e2..7cb1b15 100644 --- a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch +++ b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch @@ -1,16 +1,16 @@ -Index: linux-2.6.18-8.1.8/fs/jbd/commit.c +Index: linux-2.6.18.8/fs/jbd/commit.c =================================================================== ---- linux-2.6.18-8.1.8.orig/fs/jbd/commit.c -+++ linux-2.6.18-8.1.8/fs/jbd/commit.c -@@ -21,6 +21,7 @@ +--- linux-2.6.18.8.orig/fs/jbd/commit.c ++++ linux-2.6.18.8/fs/jbd/commit.c +@@ -22,6 +22,7 @@ #include #include #include +#include + /* - * Default IO end handler for temporary BJ_IO buffer_heads. -@@ -93,19 +94,23 @@ static int inverted_lock(journal_t *jour +@@ -95,19 +96,23 @@ static int inverted_lock(journal_t *jour return 1; } @@ -38,7 +38,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c int barrier_done = 0; if (is_journal_aborted(journal)) -@@ -117,21 +122,34 @@ static int journal_write_commit_record(j +@@ -119,21 +124,35 @@ static int journal_write_commit_record(j bh = jh2bh(descriptor); @@ -63,6 +63,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c - 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) { @@ -70,7 +71,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c + 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); @@ -82,7 +83,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c /* 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 -@@ -152,14 +170,72 @@ static int journal_write_commit_record(j +@@ -154,12 +173,70 @@ static int journal_write_commit_record(j clear_buffer_ordered(bh); set_buffer_uptodate(bh); set_buffer_dirty(bh); @@ -94,8 +95,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c + *cbh = bh; + return ret; +} - -- return (ret == -EIO); ++ +/* + * This function along with journal_submit_commit_record + * allows to write the commit record asynchronously. @@ -113,8 +113,8 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c + journal_put_journal_head(bh2jh(bh)); + + return ret; - } - ++} ++ +/* + * Wait for all submitted IO to complete. + */ @@ -123,7 +123,8 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c +{ + int ret = 0; + struct journal_head *jh; -+ + +- return (ret == -EIO); + while (commit_transaction->t_locked_list) { + struct buffer_head *bh; + @@ -154,12 +155,31 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c + cond_resched_lock(&journal->j_list_lock); + } + return ret; + } + + void journal_do_submit_data(struct buffer_head **wbuf, int bufs) +@@ -273,6 +350,20 @@ write_out_data: + journal_do_submit_data(wbuf, bufs); + } + ++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; +} + - void journal_do_submit_data(struct buffer_head **wbuf, int bufs) - { - int i; -@@ -293,6 +369,8 @@ void journal_commit_transaction(journal_ + /* + * journal_commit_transaction + * +@@ -296,6 +387,8 @@ void journal_commit_transaction(journal_ int first_tag = 0; int tag_flag; int i; @@ -168,7 +188,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c /* * First job: lock down the current transaction and wait for -@@ -428,38 +506,14 @@ void journal_commit_transaction(journal_ +@@ -439,38 +532,14 @@ void journal_commit_transaction(journal_ journal_submit_data_buffers(journal, commit_transaction); /* @@ -213,7 +233,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c spin_unlock(&journal->j_list_lock); if (err) -@@ -627,6 +681,16 @@ void journal_commit_transaction(journal_ +@@ -643,6 +712,16 @@ void journal_commit_transaction(journal_ start_journal_io: for (i = 0; i < bufs; i++) { struct buffer_head *bh = wbuf[i]; @@ -222,15 +242,15 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c + */ + 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); -@@ -642,6 +706,23 @@ start_journal_io: +@@ -659,6 +738,23 @@ start_journal_io: } } @@ -254,7 +274,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c /* 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 -@@ -740,9 +821,15 @@ wait_for_iobuf: +@@ -757,9 +853,15 @@ wait_for_iobuf: } jbd_debug(3, "JBD: commit phase 6\n"); @@ -273,10 +293,10 @@ Index: linux-2.6.18-8.1.8/fs/jbd/commit.c if (err) __journal_abort_hard(journal); -Index: linux-2.6.18-8.1.8/include/linux/jbd.h +Index: linux-2.6.18.8/include/linux/jbd.h =================================================================== ---- linux-2.6.18-8.1.8.orig/include/linux/jbd.h -+++ linux-2.6.18-8.1.8/include/linux/jbd.h +--- linux-2.6.18.8.orig/include/linux/jbd.h ++++ linux-2.6.18.8/include/linux/jbd.h @@ -148,6 +148,29 @@ typedef struct journal_header_s __be32 h_sequence; } journal_header_t; @@ -327,7 +347,7 @@ Index: linux-2.6.18-8.1.8/include/linux/jbd.h #ifdef __KERNEL__ -@@ -967,6 +994,8 @@ extern int journal_check_available_fe +@@ -1053,6 +1080,8 @@ extern int journal_check_available_fe (journal_t *, unsigned long, unsigned long, unsigned long); extern int journal_set_features (journal_t *, unsigned long, unsigned long, unsigned long); @@ -336,10 +356,10 @@ Index: linux-2.6.18-8.1.8/include/linux/jbd.h extern int journal_create (journal_t *); extern int journal_load (journal_t *journal); extern void journal_destroy (journal_t *); -Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c +Index: linux-2.6.18.8/fs/jbd/recovery.c =================================================================== ---- linux-2.6.18-8.1.8.orig/fs/jbd/recovery.c -+++ linux-2.6.18-8.1.8/fs/jbd/recovery.c +--- linux-2.6.18.8.orig/fs/jbd/recovery.c ++++ linux-2.6.18.8/fs/jbd/recovery.c @@ -21,6 +21,7 @@ #include #include @@ -360,7 +380,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c + 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); @@ -373,7 +393,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c + 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, @@ -411,10 +431,10 @@ Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c + if (calc_chksums(journal, bh, + &next_log_block, + &crc32_sum)) { -+ brelse(bh); ++ put_bh(bh); + break; + } -+ brelse(bh); ++ put_bh(bh); + continue; + } + @@ -506,7 +526,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c + 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 " @@ -535,11 +555,11 @@ Index: linux-2.6.18-8.1.8/fs/jbd/recovery.c /* 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.18-8.1.8/fs/jbd/journal.c +Index: linux-2.6.18.8/fs/jbd/journal.c =================================================================== ---- linux-2.6.18-8.1.8.orig/fs/jbd/journal.c -+++ linux-2.6.18-8.1.8/fs/jbd/journal.c -@@ -66,6 +66,7 @@ EXPORT_SYMBOL(journal_update_format); +--- linux-2.6.18.8.orig/fs/jbd/journal.c ++++ linux-2.6.18.8/fs/jbd/journal.c +@@ -67,6 +67,7 @@ EXPORT_SYMBOL(journal_update_format); EXPORT_SYMBOL(journal_check_used_features); EXPORT_SYMBOL(journal_check_available_features); EXPORT_SYMBOL(journal_set_features); @@ -547,7 +567,7 @@ Index: linux-2.6.18-8.1.8/fs/jbd/journal.c EXPORT_SYMBOL(journal_create); EXPORT_SYMBOL(journal_load); EXPORT_SYMBOL(journal_destroy); -@@ -1271,6 +1272,33 @@ int journal_set_features (journal_t *jou +@@ -1573,6 +1574,33 @@ int journal_set_features (journal_t *jou return 1; } @@ -581,10 +601,10 @@ Index: linux-2.6.18-8.1.8/fs/jbd/journal.c /** * int journal_update_format () - Update on-disk journal structure. -Index: linux-2.6.18-8.1.8/fs/Kconfig +Index: linux-2.6.18.8/fs/Kconfig =================================================================== ---- linux-2.6.18-8.1.8.orig/fs/Kconfig -+++ linux-2.6.18-8.1.8/fs/Kconfig +--- linux-2.6.18.8.orig/fs/Kconfig ++++ linux-2.6.18.8/fs/Kconfig @@ -140,6 +140,7 @@ config EXT3_FS_SECURITY config JBD @@ -593,10 +613,10 @@ Index: linux-2.6.18-8.1.8/fs/Kconfig 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.18-8.1.8/Documentation/filesystems/ext3.txt +Index: linux-2.6.18.8/Documentation/filesystems/ext3.txt =================================================================== ---- linux-2.6.18-8.1.8.orig/Documentation/filesystems/ext3.txt -+++ linux-2.6.18-8.1.8/Documentation/filesystems/ext3.txt +--- linux-2.6.18.8.orig/Documentation/filesystems/ext3.txt ++++ linux-2.6.18.8/Documentation/filesystems/ext3.txt @@ -14,6 +14,16 @@ Options When mounting an ext3 filesystem, the following option are accepted: (*) == default