Oleg is looking into this one
This appears to be a duplicate of LU-1115.
Patch here: http://review.whamcloud.com/#change,2625
I've downloaded and installed lustre-source-1.8.8-wc1_2.6.18_308.4.1.el5_lustre.x86_64.rpm on the servers. I've also downloaded the patch
when I try to apply the patch using command ""patch -p0 < /root/patch/make-bi_phys_segments-uint_new-da6629f0219f1731927577548b114fdf391f34aa.patch"" (I'm sitting in /usr/src/lustre-1.8.8) I get the error below. Am I missing something?
can't find file to patch at input line 20
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| From 5b99c2ffa980528a197f26c7d876cceeccce8dd5 Mon Sep 17 00:00:00 2001 | |
| From: Jens Axboe <jens.axboe@oracle.com> | |
| Date: Fri, 15 Aug 2008 10:56:11 +0200 | |
| Subject: [PATCH] block: make bi_phys_segments an unsigned int instead of | |
| short | |
| raid5 can overflow with more than 255 stripes, and we can increase it | |
| to an int for free on both 32 and 64-bit archs due to the padding. | |
| Signed-off-by: Jens Axboe <jens.axboe@oracle.com> | |
| — | |
| drivers/md/raid5.c | 12 ++++++------ |
| include/linux/bio.h | 2 +- |
2 files changed, 7 insertions , 7 deletions |
|
| diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c | |
| index 05b2292..37e5465 100644 | |
| — a/drivers/md/raid5.c | |
| +++ b/drivers/md/raid5.c -------------------------- File to patch: |
Looks like you have extracted the patch from the patch already and have linux kernel patch at hand, so you nee to apply it to your kernel, not to lustre sources.
I've downloaded the kernel-src and now trying to patch the kernel. I'm following instructions on http://wiki.whamcloud.com/display/PUB/Walk-thru-+Build+Lustre+1.8+on+CentOS+5.5+or+5.6+from+Whamcloud+git
when I get to quilt push -av it fails when it attempts to patch patches/raid5-zerocopy-rhel5.patch.
Any idea why?
Applying patch patches/sd_iostats-2.6-rhel5.patch
patching file drivers/scsi/Kconfig
Hunk #1 succeeded at 84 (offset 6 lines).
patching file drivers/scsi/scsi_proc.c
patching file drivers/scsi/sd.c
Hunk #1 succeeded at 62 (offset -1 lines).
Hunk #2 succeeded at 185 (offset 1 line).
Hunk #3 succeeded at 617 (offset 37 lines).
Hunk #4 succeeded at 1073 (offset -3 lines).
Hunk #5 succeeded at 1805 (offset 29 lines).
Hunk #6 succeeded at 1846 (offset -3 lines).
Hunk #7 succeeded at 2256 (offset 29 lines).
Hunk #8 succeeded at 2341 (offset 38 lines).
Hunk #9 succeeded at 2343 (offset 29 lines).
Hunk #10 succeeded at 2377 (offset 38 lines).
Applying patch patches/export_symbol_numa-2.6-fc5.patch
patching file arch/i386/kernel/smpboot.c
Hunk #1 succeeded at 627 (offset 48 lines).
Applying patch patches/blkdev_tunables-2.6-rhel5.patch
patching file include/linux/blkdev.h
Hunk #1 succeeded at 811 (offset 23 lines).
patching file include/scsi/scsi_host.h
patching file drivers/scsi/lpfc/lpfc.h
Hunk #1 succeeded at 42 with fuzz 2 (offset 4 lines).
Applying patch patches/jbd-stats-2.6-rhel5.patch
patching file include/linux/jbd.h
patching file fs/jbd/transaction.c
patching file fs/jbd/journal.c
Hunk #2 succeeded at 641 (offset 2 lines).
Hunk #4 succeeded at 1023 (offset 2 lines).
Hunk #6 succeeded at 1478 (offset 10 lines).
Hunk #7 succeeded at 2323 (offset 6 lines).
Hunk #8 succeeded at 2412 (offset 10 lines).
Hunk #9 succeeded at 2420 (offset 6 lines).
patching file fs/jbd/checkpoint.c
patching file fs/jbd/commit.c
Hunk #3 succeeded at 303 (offset 13 lines).
Hunk #5 succeeded at 425 (offset 13 lines).
Hunk #7 succeeded at 662 (offset 13 lines).
Hunk #8 succeeded at 854 (offset 5 lines).
Hunk #9 succeeded at 939 (offset 13 lines).
Applying patch patches/raid5-stats-rhel5.patch
patching file drivers/md/raid5.c
Hunk #1 succeeded at 149 (offset 34 lines).
Hunk #3 succeeded at 348 (offset 34 lines).
Hunk #5 succeeded at 684 (offset 33 lines).
Hunk #7 succeeded at 1730 (offset 33 lines).
Hunk #9 succeeded at 1920 (offset 35 lines).
Hunk #11 succeeded at 1973 (offset 35 lines).
Hunk #13 succeeded at 2312 (offset 35 lines).
Hunk #15 succeeded at 2497 (offset 35 lines).
Hunk #17 succeeded at 2569 (offset 35 lines).
Hunk #19 succeeded at 2683 (offset 35 lines).
Hunk #20 succeeded at 2760 with fuzz 2.
Hunk #21 succeeded at 3059 (offset 37 lines).
Hunk #22 succeeded at 3421 (offset 2 lines).
patching file include/linux/raid/raid5.h
Applying patch patches/raid5-configurable-cachesize-rhel5.patch
patching file drivers/md/raid5.c
Hunk #2 succeeded at 3269 (offset 39 lines).
Hunk #3 succeeded at 3826 (offset 5 lines).
Applying patch patches/raid5-large-io-rhel5.patch
patching file drivers/md/raid5.c
Hunk #1 succeeded at 3379 (offset 39 lines).
Applying patch patches/raid5-stripe-by-stripe-handling-rhel5.patch
patching file drivers/md/raid5.c
Hunk #1 succeeded at 2661 (offset 35 lines).
Hunk #3 succeeded at 2725 with fuzz 2 (offset 35 lines).
Hunk #4 succeeded at 3511 (offset 4 lines).
patching file include/linux/raid/raid5.h
Applying patch patches/raid5-merge-ios-rhel5.patch
patching file drivers/md/raid5.c
Hunk #1 succeeded at 1310 (offset 33 lines).
Hunk #3 succeeded at 1993 (offset 35 lines).
Hunk #5 succeeded at 2557 (offset 35 lines).
Hunk #7 succeeded at 2732 (offset 35 lines).
Hunk #9 succeeded at 2820 (offset 35 lines).
Hunk #11 succeeded at 2851 (offset 35 lines).
Hunk #13 succeeded at 2889 with fuzz 2 (offset 35 lines).
Hunk #14 succeeded at 3074 (offset 2 lines).
Hunk #15 succeeded at 3163 (offset 35 lines).
Applying patch patches/raid5-zerocopy-rhel5.patch
patching file drivers/md/raid5.c
Hunk #1 succeeded at 667 (offset 34 lines).
Hunk #3 succeeded at 951 (offset 34 lines).
Hunk #5 succeeded at 1115 (offset 34 lines).
Hunk #7 succeeded at 1247 (offset 34 lines).
Hunk #9 succeeded at 1752 (offset 34 lines).
Hunk #10 succeeded at 1727 with fuzz 1.
Hunk #11 succeeded at 2127 (offset 36 lines).
Hunk #13 succeeded at 2351 with fuzz 1 (offset 36 lines).
Hunk #15 succeeded at 3633 with fuzz 1 (offset 38 lines).
patching file include/linux/backing-dev.h
Hunk #1 FAILED at 48.
Hunk #2 succeeded at 100 with fuzz 2 (offset 5 lines).
1 out of 2 hunks FAILED – rejects in file include/linux/backing-dev.h
patching file include/linux/page-flags.h
Hunk #2 succeeded at 285 (offset 1 line).
patching file include/linux/raid/raid5.h
patching file mm/filemap.c
Hunk #2 FAILED at 568.
1 out of 2 hunks FAILED – rejects in file mm/filemap.c
Restoring drivers/md/raid5.c
Restoring include/linux/raid/raid5.h
Restoring include/linux/page-flags.h
Restoring include/linux/backing-dev.h
Restoring mm/filemap.c
Patch patches/raid5-zerocopy-rhel5.patch does not apply (enforce with -f)
Restoring drivers/md/raid5.c
Restoring include/linux/raid/raid5.h
Restoring include/linux/page-flags.h
Restoring include/linux/backing-dev.h
Restoring mm/filemap.c
I'm using linux-2.6.18-308.4.1.el5.x86_64 , which kernel was the patch created for?
Are you sure you have the source versions you say? I installed the following 2 src rpms:
kernel-2.6.18-308.4.1.el5.src.rpm (from vault.centos.org)
lustre-1.8.8-wc1_2.6.18_308.4.1.el5_lustre.src.rpm (from downloads.whamcloud.com)
After setting up the patches & series symlinks as described in http://wiki.whamcloud.com/display/PUB/Walk-thru-+Build+Lustre+1.8+on+CentOS+5.5+or+5.6+from+Whamcloud+git the patch series applied just fine for me:
[build@centos50 linux-2.6.18-308.4.1.el5.x86_64]$ quilt push -av Applying patch patches/lustre_version.patch patching file include/linux/lustre_version.h Applying patch patches/vfs_races-2.6-rhel5.patch patching file fs/dcache.c Hunk #2 succeeded at 1603 (offset 196 lines). Hunk #3 succeeded at 1562 (offset 66 lines). patching file include/linux/dcache.h Hunk #1 succeeded at 189 (offset 12 lines). Hunk #2 succeeded at 258 (offset 3 lines). Hunk #3 succeeded at 303 (offset 12 lines). Applying patch patches/i_filter_data.patch patching file include/linux/fs.h Hunk #1 succeeded at 663 (offset 83 lines). Applying patch patches/jbd-jcberr-2.6.18-vanilla.patch patching file include/linux/jbd.h Hunk #1 succeeded at 359 (offset 3 lines). Hunk #3 succeeded at 414 (offset 3 lines). Hunk #5 succeeded at 593 (offset 3 lines). patching file fs/jbd/checkpoint.c Hunk #1 succeeded at 713 (offset 25 lines). patching file fs/jbd/commit.c Hunk #1 succeeded at 772 (offset 64 lines). patching file fs/jbd/journal.c patching file fs/jbd/transaction.c Hunk #3 succeeded at 1335 (offset 41 lines). Applying patch patches/export_symbols-2.6.12.patch patching file fs/dcache.c Hunk #1 succeeded at 2182 (offset 601 lines). Applying patch patches/dev_read_only-2.6.18-vanilla.patch patching file block/ll_rw_blk.c Hunk #1 succeeded at 3144 (offset 77 lines). Hunk #3 succeeded at 3849 (offset 76 lines). patching file fs/block_dev.c Hunk #1 succeeded at 1145 (offset 86 lines). patching file include/linux/fs.h Hunk #1 succeeded at 1887 (offset 202 lines). Applying patch patches/export-2.6.18-vanilla.patch patching file fs/open.c Hunk #1 succeeded at 855 (offset 47 lines). patching file fs/jbd/journal.c Applying patch patches/export-show_task-2.6.18-vanilla.patch patching file kernel/sched.c Hunk #1 succeeded at 4704 with fuzz 2 (offset 6 lines). Applying patch patches/sd_iostats-2.6-rhel5.patch patching file drivers/scsi/Kconfig patching file drivers/scsi/scsi_proc.c patching file drivers/scsi/sd.c Hunk #2 succeeded at 184 (offset 1 line). Hunk #4 succeeded at 1110 (offset 10 lines). Hunk #5 succeeded at 1792 (offset -4 lines). Hunk #6 succeeded at 1879 (offset 10 lines). Hunk #7 succeeded at 2243 (offset -4 lines). Hunk #8 succeeded at 2374 (offset 10 lines). Hunk #9 succeeded at 2371 (offset -4 lines). Hunk #10 succeeded at 2410 (offset 10 lines). Applying patch patches/export_symbol_numa-2.6-fc5.patch patching file arch/i386/kernel/smpboot.c Hunk #1 succeeded at 627 (offset 48 lines). Applying patch patches/blkdev_tunables-2.6-rhel5.patch patching file include/linux/blkdev.h Hunk #1 succeeded at 811 (offset 23 lines). patching file include/scsi/scsi_host.h patching file drivers/scsi/isci/init.c Hunk #1 succeeded at 138 (offset 100 lines). patching file drivers/scsi/lpfc/lpfc.h Hunk #1 succeeded at 42 with fuzz 2 (offset 4 lines). Applying patch patches/jbd-stats-2.6-rhel5.patch patching file include/linux/jbd.h patching file fs/jbd/transaction.c patching file fs/jbd/journal.c Hunk #2 succeeded at 641 (offset 2 lines). Hunk #4 succeeded at 1023 (offset 2 lines). Hunk #6 succeeded at 1478 (offset 10 lines). Hunk #7 succeeded at 2323 (offset 6 lines). Hunk #8 succeeded at 2412 (offset 10 lines). Hunk #9 succeeded at 2420 (offset 6 lines). patching file fs/jbd/checkpoint.c patching file fs/jbd/commit.c Hunk #3 succeeded at 303 (offset 13 lines). Hunk #5 succeeded at 425 (offset 13 lines). Hunk #7 succeeded at 662 (offset 13 lines). Hunk #8 succeeded at 852 (offset 5 lines). Hunk #9 succeeded at 937 (offset 13 lines). Applying patch patches/raid5-stats-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 149 (offset 34 lines). Hunk #3 succeeded at 348 (offset 34 lines). Hunk #5 succeeded at 684 (offset 33 lines). Hunk #7 succeeded at 1730 (offset 33 lines). Hunk #9 succeeded at 1920 (offset 35 lines). Hunk #11 succeeded at 1973 (offset 35 lines). Hunk #13 succeeded at 2312 (offset 35 lines). Hunk #15 succeeded at 2497 (offset 35 lines). Hunk #17 succeeded at 2569 (offset 35 lines). Hunk #19 succeeded at 2683 (offset 35 lines). Hunk #20 succeeded at 2760 with fuzz 2. Hunk #21 succeeded at 3059 (offset 37 lines). Hunk #22 succeeded at 3421 (offset 2 lines). patching file include/linux/raid/raid5.h Applying patch patches/raid5-configurable-cachesize-rhel5.patch patching file drivers/md/raid5.c Hunk #2 succeeded at 3269 (offset 39 lines). Hunk #3 succeeded at 3826 (offset 5 lines). Applying patch patches/raid5-large-io-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 3379 (offset 39 lines). Applying patch patches/raid5-stripe-by-stripe-handling-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 2661 (offset 35 lines). Hunk #3 succeeded at 2725 with fuzz 2 (offset 35 lines). Hunk #4 succeeded at 3511 (offset 4 lines). patching file include/linux/raid/raid5.h Applying patch patches/raid5-merge-ios-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 1310 (offset 33 lines). Hunk #3 succeeded at 1993 (offset 35 lines). Hunk #5 succeeded at 2557 (offset 35 lines). Hunk #7 succeeded at 2732 (offset 35 lines). Hunk #9 succeeded at 2820 (offset 35 lines). Hunk #11 succeeded at 2851 (offset 35 lines). Hunk #13 succeeded at 2889 with fuzz 2 (offset 35 lines). Hunk #14 succeeded at 3074 (offset 2 lines). Hunk #15 succeeded at 3163 with fuzz 1 (offset 35 lines). Applying patch patches/raid5-zerocopy-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 667 (offset 34 lines). Hunk #3 succeeded at 951 (offset 34 lines). Hunk #5 succeeded at 1115 (offset 34 lines). Hunk #7 succeeded at 1247 (offset 34 lines). Hunk #9 succeeded at 1752 (offset 34 lines). Hunk #10 succeeded at 1727 with fuzz 1. Hunk #11 succeeded at 2127 (offset 36 lines). Hunk #13 succeeded at 2351 with fuzz 1 (offset 36 lines). Hunk #15 succeeded at 3633 with fuzz 1 (offset 40 lines). patching file include/linux/backing-dev.h Hunk #1 succeeded at 52 (offset 4 lines). Hunk #2 succeeded at 102 (offset 7 lines). patching file include/linux/page-flags.h Hunk #1 succeeded at 86 (offset -1 lines). Hunk #2 succeeded at 286 (offset -3 lines). patching file include/linux/raid/raid5.h patching file mm/filemap.c Hunk #2 succeeded at 576 (offset 8 lines). Applying patch patches/raid5-maxsectors-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 3628 (offset 33 lines). Applying patch patches/md-rebuild-policy.patch patching file drivers/md/md.c Hunk #3 succeeded at 5071 (offset 44 lines). Hunk #5 succeeded at 5163 (offset 44 lines). Hunk #6 succeeded at 5245 (offset 6 lines). Hunk #7 succeeded at 5322 (offset 44 lines). Hunk #8 succeeded at 5305 (offset 6 lines). Hunk #9 succeeded at 5366 (offset 44 lines). patching file include/linux/sysctl.h Hunk #1 succeeded at 946 (offset 18 lines). Applying patch patches/jbd-journal-chksum-2.6.18-vanilla.patch patching file fs/jbd/commit.c Hunk #7 succeeded at 535 (offset -2 lines). Hunk #8 succeeded at 725 (offset 4 lines). Hunk #9 succeeded at 745 (offset -2 lines). Hunk #10 succeeded at 874 (offset 9 lines). patching file include/linux/jbd.h patching file fs/jbd/recovery.c patching file fs/jbd/journal.c Hunk #2 succeeded at 1594 (offset 10 lines). patching file fs/Kconfig patching file Documentation/filesystems/ext3.txt Applying patch patches/quota-large-limits-rhel5.patch patching file fs/quota_v1.c patching file fs/quota_v2.c patching file include/linux/dqblk_v2.h patching file include/linux/quota.h Hunk #1 succeeded at 149 with fuzz 1. Hunk #2 succeeded at 177 (offset 7 lines). patching file include/linux/quotaio_v2.h Applying patch patches/md-mmp-unplug-dev.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 1490 (offset 34 lines). Hunk #2 succeeded at 3018 (offset 4 lines). Applying patch patches/mpt-fusion-max-sge.patch patching file drivers/message/fusion/Kconfig patching file drivers/message/fusion/mptbase.h Applying patch patches/jbd2-jcberr-2.6-rhel5.patch patching file include/linux/jbd2.h Hunk #1 succeeded at 408 with fuzz 2 (offset 27 lines). Hunk #3 succeeded at 463 (offset 27 lines). Hunk #5 succeeded at 644 with fuzz 2 (offset -2 lines). Hunk #6 succeeded at 1127 (offset 69 lines). patching file fs/jbd2/checkpoint.c Hunk #1 succeeded at 752 (offset 57 lines). patching file fs/jbd2/commit.c Hunk #1 succeeded at 851 (offset 19 lines). patching file fs/jbd2/journal.c Hunk #1 succeeded at 89 (offset 9 lines). patching file fs/jbd2/transaction.c Hunk #1 succeeded at 53 (offset 2 lines). Hunk #2 succeeded at 256 (offset 2 lines). Hunk #3 succeeded at 1169 (offset -184 lines). Hunk #4 succeeded at 1460 (offset 4 lines). Applying patch patches/jbd2-commit-timer-no-jiffies-rounding.diff patching file fs/jbd2/transaction.c Hunk #1 succeeded at 58 with fuzz 1 (offset 4 lines). Now at patch patches/jbd2-commit-timer-no-jiffies-rounding.diff
If I then manually apply the new patch added to the series, that goes on nicely too:
[build@centos50 linux-2.6.18-308.4.1.el5.x86_64]$ patch -p1 -i /home/bogl/Downloads/make-bi_phys_segments-uint.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 100 (offset -2 lines). patching file include/linux/bio.h Hunk #1 succeeded at 84 with fuzz 2 (offset 9 lines).
All I can think is that either your linux or lustre source wasn't what you thought.
we have a Redhat installation, so I’m using kernel-2.6.18-308.4.1.el5.src.rpm from http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/ and lustre-1.8.8-wc1_2.6.18_308.4.1.el5_lustre.src.rpm from downloads.whamcloud.com
There should be no difference between the those linux .src rpms from different sites. Just to confirm I repeated the exact same series of operations on the rpm from http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS. I still have the same good results on patching:
[build@centos50 linux-2.6.18-308.4.1.el5.x86_64]$ ln -s /home/build/rpmbuild/BUILD/lustre-1.8.8/lustre/kernel_patches/series/2.6-rhel5.series series [build@centos50 linux-2.6.18-308.4.1.el5.x86_64]$ ln -s /home/build/rpmbuild/BUILD/lustre-1.8.8/lustre/kernel_patches/patches . [build@centos50 linux-2.6.18-308.4.1.el5.x86_64]$ quilt push -av Applying patch patches/lustre_version.patch patching file include/linux/lustre_version.h Applying patch patches/vfs_races-2.6-rhel5.patch patching file fs/dcache.c Hunk #2 succeeded at 1603 (offset 196 lines). Hunk #3 succeeded at 1562 (offset 66 lines). patching file include/linux/dcache.h Hunk #1 succeeded at 189 (offset 12 lines). Hunk #2 succeeded at 258 (offset 3 lines). Hunk #3 succeeded at 303 (offset 12 lines). Applying patch patches/i_filter_data.patch patching file include/linux/fs.h Hunk #1 succeeded at 663 (offset 83 lines). Applying patch patches/jbd-jcberr-2.6.18-vanilla.patch patching file include/linux/jbd.h Hunk #1 succeeded at 359 (offset 3 lines). Hunk #3 succeeded at 414 (offset 3 lines). Hunk #5 succeeded at 593 (offset 3 lines). patching file fs/jbd/checkpoint.c Hunk #1 succeeded at 713 (offset 25 lines). patching file fs/jbd/commit.c Hunk #1 succeeded at 772 (offset 64 lines). patching file fs/jbd/journal.c patching file fs/jbd/transaction.c Hunk #3 succeeded at 1335 (offset 41 lines). Applying patch patches/export_symbols-2.6.12.patch patching file fs/dcache.c Hunk #1 succeeded at 2182 (offset 601 lines). Applying patch patches/dev_read_only-2.6.18-vanilla.patch patching file block/ll_rw_blk.c Hunk #1 succeeded at 3144 (offset 77 lines). Hunk #3 succeeded at 3849 (offset 76 lines). patching file fs/block_dev.c Hunk #1 succeeded at 1145 (offset 86 lines). patching file include/linux/fs.h Hunk #1 succeeded at 1887 (offset 202 lines). Applying patch patches/export-2.6.18-vanilla.patch patching file fs/open.c Hunk #1 succeeded at 855 (offset 47 lines). patching file fs/jbd/journal.c Applying patch patches/export-show_task-2.6.18-vanilla.patch patching file kernel/sched.c Hunk #1 succeeded at 4704 with fuzz 2 (offset 6 lines). Applying patch patches/sd_iostats-2.6-rhel5.patch patching file drivers/scsi/Kconfig patching file drivers/scsi/scsi_proc.c patching file drivers/scsi/sd.c Hunk #2 succeeded at 184 (offset 1 line). Hunk #4 succeeded at 1110 (offset 10 lines). Hunk #5 succeeded at 1792 (offset -4 lines). Hunk #6 succeeded at 1879 (offset 10 lines). Hunk #7 succeeded at 2243 (offset -4 lines). Hunk #8 succeeded at 2374 (offset 10 lines). Hunk #9 succeeded at 2371 (offset -4 lines). Hunk #10 succeeded at 2410 (offset 10 lines). Applying patch patches/export_symbol_numa-2.6-fc5.patch patching file arch/i386/kernel/smpboot.c Hunk #1 succeeded at 627 (offset 48 lines). Applying patch patches/blkdev_tunables-2.6-rhel5.patch patching file include/linux/blkdev.h Hunk #1 succeeded at 811 (offset 23 lines). patching file include/scsi/scsi_host.h patching file drivers/scsi/isci/init.c Hunk #1 succeeded at 138 (offset 100 lines). patching file drivers/scsi/lpfc/lpfc.h Hunk #1 succeeded at 42 with fuzz 2 (offset 4 lines). Applying patch patches/jbd-stats-2.6-rhel5.patch patching file include/linux/jbd.h patching file fs/jbd/transaction.c patching file fs/jbd/journal.c Hunk #2 succeeded at 641 (offset 2 lines). Hunk #4 succeeded at 1023 (offset 2 lines). Hunk #6 succeeded at 1478 (offset 10 lines). Hunk #7 succeeded at 2323 (offset 6 lines). Hunk #8 succeeded at 2412 (offset 10 lines). Hunk #9 succeeded at 2420 (offset 6 lines). patching file fs/jbd/checkpoint.c patching file fs/jbd/commit.c Hunk #3 succeeded at 303 (offset 13 lines). Hunk #5 succeeded at 425 (offset 13 lines). Hunk #7 succeeded at 662 (offset 13 lines). Hunk #8 succeeded at 852 (offset 5 lines). Hunk #9 succeeded at 937 (offset 13 lines). Applying patch patches/raid5-stats-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 149 (offset 34 lines). Hunk #3 succeeded at 348 (offset 34 lines). Hunk #5 succeeded at 684 (offset 33 lines). Hunk #7 succeeded at 1730 (offset 33 lines). Hunk #9 succeeded at 1920 (offset 35 lines). Hunk #11 succeeded at 1973 (offset 35 lines). Hunk #13 succeeded at 2312 (offset 35 lines). Hunk #15 succeeded at 2497 (offset 35 lines). Hunk #17 succeeded at 2569 (offset 35 lines). Hunk #19 succeeded at 2683 (offset 35 lines). Hunk #20 succeeded at 2760 with fuzz 2. Hunk #21 succeeded at 3059 (offset 37 lines). Hunk #22 succeeded at 3421 (offset 2 lines). patching file include/linux/raid/raid5.h Applying patch patches/raid5-configurable-cachesize-rhel5.patch patching file drivers/md/raid5.c Hunk #2 succeeded at 3269 (offset 39 lines). Hunk #3 succeeded at 3826 (offset 5 lines). Applying patch patches/raid5-large-io-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 3379 (offset 39 lines). Applying patch patches/raid5-stripe-by-stripe-handling-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 2661 (offset 35 lines). Hunk #3 succeeded at 2725 with fuzz 2 (offset 35 lines). Hunk #4 succeeded at 3511 (offset 4 lines). patching file include/linux/raid/raid5.h Applying patch patches/raid5-merge-ios-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 1310 (offset 33 lines). Hunk #3 succeeded at 1993 (offset 35 lines). Hunk #5 succeeded at 2557 (offset 35 lines). Hunk #7 succeeded at 2732 (offset 35 lines). Hunk #9 succeeded at 2820 (offset 35 lines). Hunk #11 succeeded at 2851 (offset 35 lines). Hunk #13 succeeded at 2889 with fuzz 2 (offset 35 lines). Hunk #14 succeeded at 3074 (offset 2 lines). Hunk #15 succeeded at 3163 with fuzz 1 (offset 35 lines). Applying patch patches/raid5-zerocopy-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 667 (offset 34 lines). Hunk #3 succeeded at 951 (offset 34 lines). Hunk #5 succeeded at 1115 (offset 34 lines). Hunk #7 succeeded at 1247 (offset 34 lines). Hunk #9 succeeded at 1752 (offset 34 lines). Hunk #10 succeeded at 1727 with fuzz 1. Hunk #11 succeeded at 2127 (offset 36 lines). Hunk #13 succeeded at 2351 with fuzz 1 (offset 36 lines). Hunk #15 succeeded at 3633 with fuzz 1 (offset 40 lines). patching file include/linux/backing-dev.h Hunk #1 succeeded at 52 (offset 4 lines). Hunk #2 succeeded at 102 (offset 7 lines). patching file include/linux/page-flags.h Hunk #1 succeeded at 86 (offset -1 lines). Hunk #2 succeeded at 286 (offset -3 lines). patching file include/linux/raid/raid5.h patching file mm/filemap.c Hunk #2 succeeded at 576 (offset 8 lines). Applying patch patches/raid5-maxsectors-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 3628 (offset 33 lines). Applying patch patches/md-rebuild-policy.patch patching file drivers/md/md.c Hunk #3 succeeded at 5071 (offset 44 lines). Hunk #5 succeeded at 5163 (offset 44 lines). Hunk #6 succeeded at 5245 (offset 6 lines). Hunk #7 succeeded at 5322 (offset 44 lines). Hunk #8 succeeded at 5305 (offset 6 lines). Hunk #9 succeeded at 5366 (offset 44 lines). patching file include/linux/sysctl.h Hunk #1 succeeded at 946 (offset 18 lines). Applying patch patches/jbd-journal-chksum-2.6.18-vanilla.patch patching file fs/jbd/commit.c Hunk #7 succeeded at 535 (offset -2 lines). Hunk #8 succeeded at 725 (offset 4 lines). Hunk #9 succeeded at 745 (offset -2 lines). Hunk #10 succeeded at 874 (offset 9 lines). patching file include/linux/jbd.h patching file fs/jbd/recovery.c patching file fs/jbd/journal.c Hunk #2 succeeded at 1594 (offset 10 lines). patching file fs/Kconfig patching file Documentation/filesystems/ext3.txt Applying patch patches/quota-large-limits-rhel5.patch patching file fs/quota_v1.c patching file fs/quota_v2.c patching file include/linux/dqblk_v2.h patching file include/linux/quota.h Hunk #1 succeeded at 149 with fuzz 1. Hunk #2 succeeded at 177 (offset 7 lines). patching file include/linux/quotaio_v2.h Applying patch patches/md-mmp-unplug-dev.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 1490 (offset 34 lines). Hunk #2 succeeded at 3018 (offset 4 lines). Applying patch patches/mpt-fusion-max-sge.patch patching file drivers/message/fusion/Kconfig patching file drivers/message/fusion/mptbase.h Applying patch patches/jbd2-jcberr-2.6-rhel5.patch patching file include/linux/jbd2.h Hunk #1 succeeded at 408 with fuzz 2 (offset 27 lines). Hunk #3 succeeded at 463 (offset 27 lines). Hunk #5 succeeded at 644 with fuzz 2 (offset -2 lines). Hunk #6 succeeded at 1127 (offset 69 lines). patching file fs/jbd2/checkpoint.c Hunk #1 succeeded at 752 (offset 57 lines). patching file fs/jbd2/commit.c Hunk #1 succeeded at 851 (offset 19 lines). patching file fs/jbd2/journal.c Hunk #1 succeeded at 89 (offset 9 lines). patching file fs/jbd2/transaction.c Hunk #1 succeeded at 53 (offset 2 lines). Hunk #2 succeeded at 256 (offset 2 lines). Hunk #3 succeeded at 1169 (offset -184 lines). Hunk #4 succeeded at 1460 (offset 4 lines). Applying patch patches/jbd2-commit-timer-no-jiffies-rounding.diff patching file fs/jbd2/transaction.c Hunk #1 succeeded at 58 with fuzz 1 (offset 4 lines). Now at patch patches/jbd2-commit-timer-no-jiffies-rounding.diff
I've managed to patch the kernel. So far we have not had any kernel panics.
thanks Hellen. It does seem that this is a duplicate of LU-1115 as suspected then. I am closing the ticket as such for now. We will reopen if this is proven to not be the case