From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbdFQRfS (ORCPT ); Sat, 17 Jun 2017 13:35:18 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:49654 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbdFQRfQ (ORCPT ); Sat, 17 Jun 2017 13:35:16 -0400 From: Guenter Roeck To: Evgeniy Dushistov Cc: Mark Brown , linux-kernel@vger.kernel.org, Guenter Roeck , Arnd Bergmann , Al Viro Subject: [PATCH] ufs: Fix build errors on 32 bit machines Date: Sat, 17 Jun 2017 10:35:13 -0700 Message-Id: <1497720913-10787-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Various 32 builds fail with error messages such as ERROR: "__udivdi3" [fs/ufs/ufs.ko] undefined! due to a variable type change from 32 bit to 64 bit. Fixes: c596961d1b4c ("ufs: fix s_size/s_dsize users") Reported-by: Arnd Bergmann Cc: Arnd Bergmann Cc: Al Viro Signed-off-by: Guenter Roeck --- fs/ufs/balloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index 0315fea1d589..a93121873fa6 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -459,7 +459,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment, case UFS_OPTSPACE: request = newcount; if (uspi->s_minfree < 5 || uspi->cs_total.cs_nffree - > uspi->s_dsize * uspi->s_minfree / (2 * 100)) + > div_u64(uspi->s_dsize * uspi->s_minfree, 2 * 100)) break; usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME); break; @@ -468,8 +468,8 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment, case UFS_OPTTIME: request = uspi->s_fpb; - if (uspi->cs_total.cs_nffree < uspi->s_dsize * - (uspi->s_minfree - 2) / 100) + if (uspi->cs_total.cs_nffree < + div_u64(uspi->s_dsize * (uspi->s_minfree - 2), 100)) break; usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME); break; -- 2.7.4