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

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

[Jeff Liu]

From: Jie Liu <jeff.liu@oracle.com>

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@intel.com>
Cc: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
 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);
 }
-- 
1.7.9.5

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Dave Chinner]

On Tue, Aug 13, 2013 at 01:32:00PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
> 
> 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@intel.com>
> Cc: Dave Chinner <dchinner@redhat.com>
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>

You beat me to it, Jeff. I got an email from Fengguang's build farm,
too. :)

Your fix looks good.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Jeff Liu]

On 08/13/2013 02:53 PM, Dave Chinner wrote:

> On Tue, Aug 13, 2013 at 01:32:00PM +0800, Jeff Liu wrote:
>> From: Jie Liu <jeff.liu@oracle.com>
>>
>> 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@intel.com>
>> Cc: Dave Chinner <dchinner@redhat.com>
>> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> 
> You beat me to it, Jeff. I got an email from Fengguang's build farm,
> too. :)

Hi Dave,

I'm on a longer vacations these days(until next week).  I have asked
my friend for help checking our mailing list to watch if there's any
email for me before the leaving, so I got his phone call this morning
for this bug. :)

> 
> Your fix looks good.
> 
> Reviewed-by: Dave Chinner <dchinner@redhat.com>

Thanks for your quick review!

-Jeff

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Eric Sandeen]

On 8/13/13 2:51 AM, Jeff Liu wrote:
> On 08/13/2013 02:53 PM, Dave Chinner wrote:
> 
>> On Tue, Aug 13, 2013 at 01:32:00PM +0800, Jeff Liu wrote:
>>> From: Jie Liu <jeff.liu@oracle.com>
>>>
>>> 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@intel.com>
>>> Cc: Dave Chinner <dchinner@redhat.com>
>>> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
>>
>> You beat me to it, Jeff. I got an email from Fengguang's build farm,
>> too. :)
> 
> Hi Dave,
> 
> I'm on a longer vacations these days(until next week).  I have asked
> my friend for help checking our mailing list to watch if there's any
> email for me before the leaving, so I got his phone call this morning
> for this bug. :)

Now that's dedication.  :)

-Eric

>>
>> Your fix looks good.
>>
>> Reviewed-by: Dave Chinner <dchinner@redhat.com>
> 
> Thanks for your quick review!
> 
> -Jeff
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Ben Myers]

On Tue, Aug 13, 2013 at 01:32:00PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
> 
> 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@intel.com>
> Cc: Dave Chinner <dchinner@redhat.com>
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>

Applied.  Thanks Jeff.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs