Kristen J. Webb
2011-Sep-28 16:02 UTC
[Lustre-discuss] quilt messages on CentOS 5.7 x86_64
Hi All, I''ve moved to CentOS 5.7 (5.6 seems to have disappeared from the download wiki). I''m following along with the instructions from: http://wiki.whamcloud.com/display/PUB/Walk-thru-+Build+Lustre+1.8+on+CentOS+5.5+or+5.6+from+Whamcloud+git NOTE: lots of changes in 5.7 for where things are/called, I''ll submit them if I can get it working. I get to the step for: quilt push -av And get a few messages that don''t look good: 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 and maybe: Patch patches/raid5-zerocopy-rhel5.patch does not apply (enforce with -f) along with a lot of "fuzz". Is it safe to continue? I''m concerned about all of the Restoring messages at the end of the output. Thanks! Kris Here is the entire log just in case: 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 1599 (offset 192 lines). patching file include/linux/dcache.h Hunk #1 succeeded at 174 (offset -3 lines). Hunk #2 succeeded at 258 (offset 3 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 765 (offset 57 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 2157 (offset 576 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 #2 succeeded at 3153 with fuzz 2. Hunk #3 succeeded at 3833 (offset 60 lines). patching file fs/block_dev.c Hunk #1 succeeded at 1144 (offset 85 lines). patching file include/linux/fs.h Hunk #1 succeeded at 1882 (offset 197 lines). Applying patch patches/export-2.6.18-vanilla.patch patching file fs/jbd/journal.c 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 1072 (offset -4 lines). Hunk #5 succeeded at 1805 (offset 29 lines). Hunk #6 succeeded at 1845 (offset -4 lines). Hunk #7 succeeded at 2256 (offset 29 lines). Hunk #8 succeeded at 2340 (offset 37 lines). Hunk #9 succeeded at 2343 (offset 29 lines). Hunk #10 succeeded at 2376 (offset 37 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 808 (offset 20 lines). patching file include/scsi/scsi_host.h patching file drivers/scsi/lpfc/lpfc.h 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 1470 (offset 2 lines). Hunk #7 succeeded at 2323 (offset 6 lines). Hunk #8 succeeded at 2404 (offset 2 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 #6 succeeded at 493 (offset -2 lines). Hunk #7 succeeded at 662 (offset 13 lines). Hunk #8 succeeded at 847 (offset -2 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 #14 succeeded at 2448 (offset 2 lines). Hunk #15 succeeded at 2497 (offset 35 lines). Hunk #16 succeeded at 2502 (offset 2 lines). Hunk #17 succeeded at 2569 (offset 35 lines). Hunk #18 succeeded at 2639 (offset 2 lines). Hunk #19 succeeded at 2683 (offset 35 lines). Hunk #20 succeeded at 2762 with fuzz 2 (offset 2 lines). Hunk #21 succeeded at 3059 (offset 37 lines). Hunk #22 succeeded at 3423 (offset 4 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 3271 (offset 41 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 3381 (offset 41 lines). Applying patch patches/raid5-stripe-by-stripe-handling-rhel5.patch patching file drivers/md/raid5.c Hunk #1 succeeded at 2663 (offset 37 lines). Hunk #3 succeeded at 2727 with fuzz 2 (offset 37 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 2559 (offset 37 lines). Hunk #7 succeeded at 2734 (offset 37 lines). Hunk #9 succeeded at 2822 (offset 37 lines). Hunk #11 succeeded at 2853 (offset 37 lines). Hunk #13 succeeded at 2891 with fuzz 2 (offset 37 lines). Hunk #14 succeeded at 3074 (offset 2 lines). Hunk #15 succeeded at 3165 (offset 37 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 #14 succeeded at 2669 (offset 2 lines). Hunk #15 succeeded at 3633 with fuzz 1 (offset 38 lines). Hunk #16 succeeded at 3686 (offset 2 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 succeeded at 574 (offset 6 lines). Restoring include/linux/backing-dev.h Restoring include/linux/page-flags.h Restoring include/linux/raid/raid5.h Restoring mm/filemap.c Restoring drivers/md/raid5.c Patch patches/raid5-zerocopy-rhel5.patch does not apply (enforce with -f) Restoring include/linux/backing-dev.h Restoring include/linux/page-flags.h Restoring include/linux/raid/raid5.h Restoring mm/filemap.c Restoring drivers/md/raid5.c -- Mr. Kristen J. Webb Teradactyl LLC. PHONE: 1-505-242-1091 EMAIL: kwebb at teradactyl.com VISIT: http://www.teradactyl.com Home of the True incremental Backup System
Sadly, it is not so much unsafe to continue as impossible - the patches that failed were reverted, so you don''t have a properly patched source. At this point, you would have to walk through the Lustre patches and fix each place where there is a FAIL. The fixes themselves are usually trivial, but the process is a bit of work. Have you tried running our 5.5/5.6 kernel with your 5.7 install? I don''t know what changes there are in 5.7 however. cliffw On Wed, Sep 28, 2011 at 9:02 AM, Kristen J. Webb <kwebb at teradactyl.com>wrote:> Hi All, > I''ve moved to CentOS 5.7 (5.6 seems to have disappeared > from the download wiki). I''m following along with the > instructions from: > > > http://wiki.whamcloud.com/display/PUB/Walk-thru-+Build+Lustre+1.8+on+CentOS+5.5+or+5.6+from+Whamcloud+git > > NOTE: lots of changes in 5.7 for where things are/called, > I''ll submit them if I can get it working. > > I get to the step for: > > quilt push -av > > And get a few messages that don''t look good: > > 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 > > and maybe: > > Patch patches/raid5-zerocopy-rhel5.patch does not apply (enforce with -f) > > along with a lot of "fuzz". > > Is it safe to continue? I''m concerned about all of the Restoring messages > at the end of the output. > > Thanks! > Kris > > Here is the entire log just in case: > > 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 1599 (offset 192 lines). > patching file include/linux/dcache.h > Hunk #1 succeeded at 174 (offset -3 lines). > Hunk #2 succeeded at 258 (offset 3 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 765 (offset 57 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 2157 (offset 576 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 #2 succeeded at 3153 with fuzz 2. > Hunk #3 succeeded at 3833 (offset 60 lines). > patching file fs/block_dev.c > Hunk #1 succeeded at 1144 (offset 85 lines). > patching file include/linux/fs.h > Hunk #1 succeeded at 1882 (offset 197 lines). > > Applying patch patches/export-2.6.18-vanilla.patch > patching file fs/jbd/journal.c > > 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 1072 (offset -4 lines). > Hunk #5 succeeded at 1805 (offset 29 lines). > Hunk #6 succeeded at 1845 (offset -4 lines). > Hunk #7 succeeded at 2256 (offset 29 lines). > Hunk #8 succeeded at 2340 (offset 37 lines). > Hunk #9 succeeded at 2343 (offset 29 lines). > Hunk #10 succeeded at 2376 (offset 37 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 808 (offset 20 lines). > patching file include/scsi/scsi_host.h > patching file drivers/scsi/lpfc/lpfc.h > > 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 1470 (offset 2 lines). > Hunk #7 succeeded at 2323 (offset 6 lines). > Hunk #8 succeeded at 2404 (offset 2 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 #6 succeeded at 493 (offset -2 lines). > Hunk #7 succeeded at 662 (offset 13 lines). > Hunk #8 succeeded at 847 (offset -2 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 #14 succeeded at 2448 (offset 2 lines). > Hunk #15 succeeded at 2497 (offset 35 lines). > Hunk #16 succeeded at 2502 (offset 2 lines). > Hunk #17 succeeded at 2569 (offset 35 lines). > Hunk #18 succeeded at 2639 (offset 2 lines). > Hunk #19 succeeded at 2683 (offset 35 lines). > Hunk #20 succeeded at 2762 with fuzz 2 (offset 2 lines). > Hunk #21 succeeded at 3059 (offset 37 lines). > Hunk #22 succeeded at 3423 (offset 4 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 3271 (offset 41 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 3381 (offset 41 lines). > > Applying patch patches/raid5-stripe-by-stripe-handling-rhel5.patch > patching file drivers/md/raid5.c > Hunk #1 succeeded at 2663 (offset 37 lines). > Hunk #3 succeeded at 2727 with fuzz 2 (offset 37 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 2559 (offset 37 lines). > Hunk #7 succeeded at 2734 (offset 37 lines). > Hunk #9 succeeded at 2822 (offset 37 lines). > Hunk #11 succeeded at 2853 (offset 37 lines). > Hunk #13 succeeded at 2891 with fuzz 2 (offset 37 lines). > Hunk #14 succeeded at 3074 (offset 2 lines). > Hunk #15 succeeded at 3165 (offset 37 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 #14 succeeded at 2669 (offset 2 lines). > Hunk #15 succeeded at 3633 with fuzz 1 (offset 38 lines). > Hunk #16 succeeded at 3686 (offset 2 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 succeeded at 574 (offset 6 lines). > Restoring include/linux/backing-dev.h > Restoring include/linux/page-flags.h > Restoring include/linux/raid/raid5.h > Restoring mm/filemap.c > Restoring drivers/md/raid5.c > Patch patches/raid5-zerocopy-rhel5.patch does not apply (enforce with -f) > Restoring include/linux/backing-dev.h > Restoring include/linux/page-flags.h > Restoring include/linux/raid/raid5.h > Restoring mm/filemap.c > Restoring drivers/md/raid5.c > > -- > Mr. Kristen J. Webb > Teradactyl LLC. > > PHONE: 1-505-242-1091 > EMAIL: kwebb at teradactyl.com > VISIT: http://www.teradactyl.com > > Home of the > > True incremental Backup System > _______________________________________________ > Lustre-discuss mailing list > Lustre-discuss at lists.lustre.org > http://lists.lustre.org/mailman/listinfo/lustre-discuss >-- cliffw Support Guy WhamCloud, Inc. www.whamcloud.com -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.lustre.org/pipermail/lustre-discuss/attachments/20110928/c824cc68/attachment.html