Message ID | 20120628024356.GB17989@thor.bakeyournoodle.com |
---|---|
State | Superseded, archived |
Headers | show |
On Thu, Jun 28, 2012 at 12:43:56PM +1000, Tony Breeds wrote: > > Okay so I think you want somethign like: Yep! > What I did was remove dblist.o from my libext2fs.a and I now get: > /home/tony/src/e2fsprogs/../e2fsprogs-root/lib/libext2fs.a(gen_bitmap64.o): In function `ext2fs_alloc_generic_bmap': > /home/tony/src/e2fsprogs-build/lib/ext2fs/../../../e2fsprogs/lib/ext2fs/gen_bitmap64.c:112: undefined reference to `ext2fs_get_num_dirs' > > So it looks like dblist.o is being pulled in for ext2fs_get_num_dirs() > in that case a EXT2FS_BMAP64_AUTODIR bmap type has been asked for. > > How would you feel about moving ext2fs_get_num_dirs from dblist.c to > blknum.c? Sure, no problem. Take a look at this set of patches (see attached). With this and the set of ext2fs functions that I understand yaboot is using, I think it solves the concern that you have. This will be in the next branch of the e2fsprogs. Regards, - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 30, 2012 at 05:45:32PM -0400, Theodore Ts'o wrote: > On Thu, Jun 28, 2012 at 12:43:56PM +1000, Tony Breeds wrote: > > > > Okay so I think you want somethign like: > > Yep! > > > What I did was remove dblist.o from my libext2fs.a and I now get: > > /home/tony/src/e2fsprogs/../e2fsprogs-root/lib/libext2fs.a(gen_bitmap64.o): In function `ext2fs_alloc_generic_bmap': > > /home/tony/src/e2fsprogs-build/lib/ext2fs/../../../e2fsprogs/lib/ext2fs/gen_bitmap64.c:112: undefined reference to `ext2fs_get_num_dirs' > > > > So it looks like dblist.o is being pulled in for ext2fs_get_num_dirs() > > in that case a EXT2FS_BMAP64_AUTODIR bmap type has been asked for. > > > > How would you feel about moving ext2fs_get_num_dirs from dblist.c to > > blknum.c? > > Sure, no problem. > > Take a look at this set of patches (see attached). With this and the > set of ext2fs functions that I understand yaboot is using, I think it > solves the concern that you have. This will be in the next branch of > the e2fsprogs. Thanks so much Ted for your help with my patches and the next set. I tried next + your 7 patches and yaboot only fails with errors for calloc and abort. Both of these I'm very happy to fix in yaboot. Looking forward to v1.42.6 :) Yours Tony
On Tue, Jul 31, 2012 at 03:21:50PM +1000, Tony Breeds wrote: > Thanks so much Ted for your help with my patches and the next set. > > I tried next + your 7 patches and yaboot only fails with errors for > calloc and abort. Both of these I'm very happy to fix in yaboot. > > Looking forward to v1.42.6 :) Unfortunately, all of these changes put together were significant enough that I didn't feel comfortable putting them in the 1.42.x maintenance branch, especially since Debian is going through its freeze process and I'm trying to get 1.42.5 into the release. So I'm being a lot more conservative about what sort of changes I'm allowing into the maintenance branch at this point. The 'master' and 'next' branches in git are targetting the 1.43 release of e2fsprogs. If you need a tarball, and not just git tree reference, I could cut a pre-release snapshot for testing purposes. I was planning on doing that soon for the metadata checksum and/or inline data features in any case. Regards, - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 31, 2012 at 03:57:26PM -0400, Theodore Ts'o wrote: > Unfortunately, all of these changes put together were significant > enough that I didn't feel comfortable putting them in the 1.42.x > maintenance branch, especially since Debian is going through its > freeze process and I'm trying to get 1.42.5 into the release. So I'm > being a lot more conservative about what sort of changes I'm allowing > into the maintenance branch at this point. Okay. > The 'master' and 'next' branches in git are targetting the 1.43 > release of e2fsprogs. If you need a tarball, and not just git tree > reference, I could cut a pre-release snapshot for testing purposes. I > was planning on doing that soon for the metadata checksum and/or > inline data features in any case. I don't think I specifically need it, but if I see an RC or testing snapshot I'll certainly use it :) Again thanks for your help on this. Yours Tony
diff --git a/e2fsck/sigcatcher.c b/e2fsck/sigcatcher.c index 10b9328..bd56c3f 100644 --- a/e2fsck/sigcatcher.c +++ b/e2fsck/sigcatcher.c @@ -387,6 +387,7 @@ void sigcatcher_setup(void) sigaction(SIGILL, &sa, 0); sigaction(SIGBUS, &sa, 0); sigaction(SIGSEGV, &sa, 0); + sigaction(SIGABRT, &sa, 0); } diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c index e6b7e04..74140ec 100644 --- a/lib/ext2fs/blkmap64_rb.c +++ b/lib/ext2fs/blkmap64_rb.c @@ -134,10 +134,8 @@ static void rb_get_new_extent(struct bmap_rb_extent **ext, __u64 start, retval = ext2fs_get_mem(sizeof (struct bmap_rb_extent), &new_ext); - if (retval) { - perror("ext2fs_get_mem"); - exit(1); - } + if (retval) + abort(); new_ext->start = start; new_ext->count = count;