On Wed, Jul 18, 2001 at 07:24:25PM +0200, Alfons Hoogervorst
wrote:> Lo,
>
> Is there already a patch out for latest 2.4.6-ac release? I'm pretty
sure
> that the ext3 patch -ac2 can not be applied on this release.
No, but I was just looking at this, and if you grab ext3 out of CVS and
generate a patch against 2.4.7pre6, it applies to 2.4.6-ac5 with a handful
of fuzz and rejects that look simple to resolve, though I haven't done it
yet, and there may be semantic differences of which I am unaware.
I was planning on getting to it after work. xxdiff is your friend. :-)
Once you do this, it is rather simple to patch the changes going forward
by grabbing incremental patches from CVS, which tend to be sparse, and hence
apply cleanly with offsets.
Regards,
Bill Rugolsky
[rugolsky@k7 linux-2.4.6-ac5]$ patch -p1 --dry-run <
../linux-2.4.7pre6-ext3-0.9.3.patch
patching file Documentation/Configure.help
Hunk #1 FAILED at 11757.
1 out of 1 hunk FAILED -- saving rejects to file
Documentation/Configure.help.rej
patching file drivers/block/ll_rw_blk.c
patching file drivers/block/loop.c
patching file drivers/ide/ide-disk.c
Hunk #1 succeeded at 367 with fuzz 1.
patching file drivers/scsi/scsi_merge.c
patching file fs/Config.in
Hunk #1 succeeded at 22 with fuzz 2 (offset 2 lines).
patching file fs/Makefile
Hunk #1 FAILED at 7.
1 out of 2 hunks FAILED -- saving rejects to file fs/Makefile.rej
patching file fs/buffer.c
Hunk #8 succeeded at 1126 (offset -1 lines).
Hunk #10 succeeded at 1155 (offset -1 lines).
Hunk #12 succeeded at 1187 (offset -1 lines).
Hunk #14 succeeded at 1256 (offset -1 lines).
Hunk #16 succeeded at 1304 (offset -1 lines).
Hunk #18 succeeded at 1343 (offset -1 lines).
Hunk #20 succeeded at 1489 (offset -1 lines).
Hunk #22 succeeded at 1529 (offset -1 lines).
Hunk #26 succeeded at 1682 (offset 21 lines).
Hunk #28 succeeded at 1755 (offset 32 lines).
Hunk #30 succeeded at 2514 (offset 34 lines).
patching file fs/ext3/Makefile
patching file fs/ext3/acl.c
patching file fs/ext3/balloc.c
patching file fs/ext3/bitmap.c
patching file fs/ext3/dir.c
patching file fs/ext3/file.c
patching file fs/ext3/fsync.c
patching file fs/ext3/ialloc.c
patching file fs/ext3/inode.c
patching file fs/ext3/ioctl.c
patching file fs/ext3/namei.c
patching file fs/ext3/super.c
patching file fs/ext3/symlink.c
patching file fs/inode.c
Hunk #1 succeeded at 106 (offset 1 line).
patching file fs/jbd/Makefile
patching file fs/jbd/checkpoint.c
patching file fs/jbd/commit.c
patching file fs/jbd/journal.c
patching file fs/jbd/recovery.c
patching file fs/jbd/revoke.c
patching file fs/jbd/transaction.c
patching file fs/jbd-kernel.c
patching file fs/open.c
Hunk #1 succeeded at 82 (offset 1 line).
patching file fs/super.c
patching file include/linux/buffer-trace.h
patching file include/linux/capability.h
patching file include/linux/ext3_fs.h
patching file include/linux/ext3_fs_i.h
patching file include/linux/ext3_fs_sb.h
patching file include/linux/ext3_jbd.h
patching file include/linux/fs.h
Hunk #1 succeeded at 21 with fuzz 1.
Hunk #5 FAILED at 381.
Hunk #6 succeeded at 445 with fuzz 2 (offset 3 lines).
Hunk #8 succeeded at 655 (offset 2 lines).
Hunk #9 succeeded at 705 (offset 1 line).
Hunk #10 succeeded at 1108 (offset 36 lines).
Hunk #11 succeeded at 1105 (offset 1 line).
Hunk #12 succeeded at 1188 (offset 36 lines).
Hunk #13 succeeded at 1325 (offset 1 line).
1 out of 13 hunks FAILED -- saving rejects to file include/linux/fs.h.rej
patching file include/linux/jbd.h
patching file include/linux/journal-head.h
patching file include/linux/sched.h
Hunk #1 succeeded at 400 (offset 2 lines).
patching file kernel/sysctl.c
Hunk #2 succeeded at 317 (offset 7 lines).
patching file mm/filemap.c
Hunk #1 succeeded at 201 (offset 8 lines).
Hunk #2 succeeded at 2657 (offset -2 lines).
Hunk #3 succeeded at 2709 (offset 13 lines).
patching file mm/memory.c
Hunk #1 succeeded at 1214 (offset 12 lines).
Hunk #3 succeeded at 1268 (offset 12 lines).
patching file mm/vmscan.c
Hunk #2 succeeded at 412 (offset 8 lines).
Hunk #3 succeeded at 561 (offset 11 lines).