diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-09-28 03:04:43 +0200 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-09-28 03:04:43 +0200 |
| commit | 215101c36012399cf2eaee849de54eeefc9f618c (patch) | |
| tree | 02b4f4e8e312503be9515a2b064528b25ec7d8f2 /fs | |
| parent | [XFS] pv 955157, rv bnaujok - break the loop on EFAULT formatter() error (diff) | |
| download | linux-215101c36012399cf2eaee849de54eeefc9f618c.tar.xz linux-215101c36012399cf2eaee849de54eeefc9f618c.zip | |
[XFS] Fix kmem_zalloc_greedy warnings on 64 bit platforms.
SGI-PV: 955302
SGI-Modid: xfs-linux-melb:xfs-kern:26907a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/quota/xfs_qm.c | 3 | ||||
| -rw-r--r-- | fs/xfs/xfs_itable.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_mount.h | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_vfsops.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 8b2c6cf2c849..7c6a3a50379e 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c @@ -112,7 +112,8 @@ xfs_Gqm_init(void) { xfs_dqhash_t *udqhash, *gdqhash; xfs_qm_t *xqm; - uint i, hsize; + size_t hsize; + uint i; /* * Initialize the dquot hash tables. diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index e338d6cf0273..b608b8ab1dd6 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c @@ -325,7 +325,7 @@ xfs_bulkstat( xfs_agino_t gino; /* current btree rec's start inode */ int i; /* loop index */ int icount; /* count of inodes good in irbuf */ - int irbsize; /* size of irec buffer in bytes */ + size_t irbsize; /* size of irec buffer in bytes */ xfs_ino_t ino; /* inode number (filesystem) */ xfs_inobt_rec_incore_t *irbp; /* current irec buffer pointer */ xfs_inobt_rec_incore_t *irbuf; /* start of irec buffer */ diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 3091c44f29ec..e5f396ff9a3d 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -331,7 +331,7 @@ typedef struct xfs_mount { xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */ lock_t m_agirotor_lock;/* .. and lock protecting it */ xfs_agnumber_t m_maxagi; /* highest inode alloc group */ - uint m_ihsize; /* size of next field */ + size_t m_ihsize; /* size of next field */ struct xfs_ihash *m_ihash; /* fs private inode hash table*/ struct xfs_inode *m_inodes; /* active inode list */ struct list_head m_del_inodes; /* inodes to reclaim */ diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index a34796e57afb..62336a4cc5a4 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c @@ -1922,7 +1922,7 @@ xfs_showargs( } if (mp->m_flags & XFS_MOUNT_IHASHSIZE) - seq_printf(m, "," MNTOPT_IHASHSIZE "=%d", mp->m_ihsize); + seq_printf(m, "," MNTOPT_IHASHSIZE "=%d", (int)mp->m_ihsize); if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) seq_printf(m, "," MNTOPT_ALLOCSIZE "=%dk", |