On 09/17/2012 10:46 AM, Randy Dunlap wrote: > On 09/17/2012 04:59 AM, Stephen Rothwell wrote: > >> Hi all, >> >> OK, so this was a bad one :-( >> >> Changes since 201209014: >> >> New tree: jfs >> > > > > on i386: > > modular build: > ERROR: "__divdi3" [fs/jfs/jfs.ko] undefined! > > or builtin: > fs/built-in.o: In function `dbDiscardAG': > (.text+0x12988b): undefined reference to `__divdi3'
Thanks Randy. This should fix it. I'll integrate it back into the proper patch in the jfs tree for the next pull. jfs: fix i386 build error. Replace 64-bit division with do_div() Signed-off-by: Dave Kleikamp <[email protected]> diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index eb988a9..174feb6 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -1640,13 +1640,15 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) } *totrim, *tt; /* max blkno / nblocks pairs to trim */ - int count = 0, range_cnt = 32 * 1024; + int count = 0, range_cnt; /* prevent others from writing new stuff here, while trimming */ IWRITE_LOCK(ipbmap, RDWRLOCK_DMAP); nblocks = bmp->db_agfree[agno]; - range_cnt = min_t(int, range_cnt, nblocks / minlen + 1); + range_cnt = nblocks; + do_div(range_cnt, (int)minlen); + range_cnt = min(range_cnt + 1, 32 * 1024); totrim = kmalloc(sizeof(struct range2trim) * range_cnt, GFP_NOFS); if (totrim == NULL) { jfs_error(bmp->db_ipbmap->i_sb, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
