xfs
[Top] [All Lists]

[PATCH v2] xfs: fix sparse inodes 32-bit compile failure

To: xfs@xxxxxxxxxxx
Subject: [PATCH v2] xfs: fix sparse inodes 32-bit compile failure
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Mon, 1 Jun 2015 17:16:50 -0400
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1433169194-41808-2-git-send-email-bfoster@xxxxxxxxxx>
References: <1433169194-41808-2-git-send-email-bfoster@xxxxxxxxxx>
The kbuild test robot reports the following compilation failure with a
32-bit kernel configuration:

        fs/built-in.o: In function `xfs_ifree_cluster':
        >> xfs_inode.c:(.text+0x17ac84): undefined reference to `__umoddi3'

This is due to the use of the modulus operator on a 64-bit variable in
the ASSERT() added as part of the following commit:

        xfs: skip unallocated regions of inode chunks in xfs_ifree_cluster()

This ASSERT() simply checks that the offset of the inode in a sparse
cluster is appropriately aligned. Since the maximum inode record offset
is 63 (for a 64 inode record) and the calculated offset here should be
something less than that, just use a 32-bit variable to store the offset
and call the do_mod() helper.

Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
---

The do_mod() helper requires use of a variable for the first parameter,
so that alone probably resolves the issue. This uses do_mod()
nonetheless...

Brian

 fs/xfs/xfs_inode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 4c054f6..17cd90c 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2244,6 +2244,7 @@ xfs_ifree_cluster(
        int                     inodes_per_cluster;
        int                     nbufs;
        int                     i, j;
+       int                     ioffset;
        xfs_daddr_t             blkno;
        xfs_buf_t               *bp;
        xfs_inode_t             *ip;
@@ -2264,9 +2265,9 @@ xfs_ifree_cluster(
                 * physically allocated. Skip the cluster if an inode falls into
                 * a sparse region.
                 */
-               if ((xic->alloc & XFS_INOBT_MASK(inum - xic->first_ino)) == 0) {
-                       ASSERT(((inum - xic->first_ino) %
-                               inodes_per_cluster) == 0);
+               ioffset = inum - xic->first_ino;
+               if ((xic->alloc & XFS_INOBT_MASK(ioffset)) == 0) {
+                       ASSERT(do_mod(ioffset, inodes_per_cluster) == 0);
                        continue;
                }
 
-- 
1.9.3

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