xfs
[Top] [All Lists]

Re: linux-next: Tree for Aug 13 (xfs)

To: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Subject: Re: linux-next: Tree for Aug 13 (xfs)
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Tue, 13 Aug 2013 13:34:25 -0500
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <520A6607.7060002@xxxxxxxxxxxxx>
References: <20130813182832.16d18ef3dbc267c1a229bcd6@xxxxxxxxxxxxxxxx> <520A6607.7060002@xxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130801 Thunderbird/17.0.8
On 8/13/13 11:59 AM, Randy Dunlap wrote:
> On 08/13/13 01:28, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20130812:
>>
> 
> on i386:
> 
> fs/built-in.o: In function `xfs_log_calc_minimum_size':
> (.text+0x1797a9): undefined reference to `__udivdi3'
> 
> 

See:

[PATCH] xfs: call roundup_64() to calculate the min_logblks

on the xfs list:

From: Jie Liu <jeff.liu@xxxxxxxxxx>

Replace roundup() with roundup_64() as we calculate min_logblks
with 64-bit divisions.  Hence, call roundup() will cause the
following error while compiling a 32-bit kernel:

fs/built-in.o: In function `xfs_log_calc_minimum_size':
fs/xfs/xfs_log_rlimit.c:140: undefined reference to `__udivdi3'

Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
---
 fs/xfs/xfs_log_rlimit.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/xfs_log_rlimit.c
index 6b17ef4..bbcec0b 100644
--- a/fs/xfs/xfs_log_rlimit.c
+++ b/fs/xfs/xfs_log_rlimit.c
@@ -136,10 +136,12 @@ xfs_log_calc_minimum_size(
         * Also, the log size should be a multiple of the log stripe unit, round
         * it up to lsunit boundary if lsunit is specified.
         */
-       if (lsunit)
-               min_logblks = roundup(BTOBB(max_logres), lsunit) + 2 * lsunit;
-       else
+       if (lsunit) {
+               min_logblks = roundup_64(BTOBB(max_logres), lsunit) +
+                             2 * lsunit;
+       } else
                min_logblks = BTOBB(max_logres) + 2 * BBSIZE;
        min_logblks *= XFS_MIN_LOG_FACTOR;
+
        return XFS_BB_TO_FSB(mp, min_logblks);
 }
-- 

-Eric

<Prev in Thread] Current Thread [Next in Thread>