aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-09-27 21:04:43 -0400
committerTim Shimmin <tes@sgi.com>2006-09-27 21:04:43 -0400
commit215101c36012399cf2eaee849de54eeefc9f618c (patch)
tree02b4f4e8e312503be9515a2b064528b25ec7d8f2 /fs
parente132f54ce8660bbf34723cc12cb11e6f61d6fbac (diff)
[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.c3
-rw-r--r--fs/xfs/xfs_itable.c2
-rw-r--r--fs/xfs/xfs_mount.h2
-rw-r--r--fs/xfs/xfs_vfsops.c2
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)
112{ 112{
113 xfs_dqhash_t *udqhash, *gdqhash; 113 xfs_dqhash_t *udqhash, *gdqhash;
114 xfs_qm_t *xqm; 114 xfs_qm_t *xqm;
115 uint i, hsize; 115 size_t hsize;
116 uint i;
116 117
117 /* 118 /*
118 * Initialize the dquot hash tables. 119 * 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(
325 xfs_agino_t gino; /* current btree rec's start inode */ 325 xfs_agino_t gino; /* current btree rec's start inode */
326 int i; /* loop index */ 326 int i; /* loop index */
327 int icount; /* count of inodes good in irbuf */ 327 int icount; /* count of inodes good in irbuf */
328 int irbsize; /* size of irec buffer in bytes */ 328 size_t irbsize; /* size of irec buffer in bytes */
329 xfs_ino_t ino; /* inode number (filesystem) */ 329 xfs_ino_t ino; /* inode number (filesystem) */
330 xfs_inobt_rec_incore_t *irbp; /* current irec buffer pointer */ 330 xfs_inobt_rec_incore_t *irbp; /* current irec buffer pointer */
331 xfs_inobt_rec_incore_t *irbuf; /* start of irec buffer */ 331 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 {
331 xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */ 331 xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */
332 lock_t m_agirotor_lock;/* .. and lock protecting it */ 332 lock_t m_agirotor_lock;/* .. and lock protecting it */
333 xfs_agnumber_t m_maxagi; /* highest inode alloc group */ 333 xfs_agnumber_t m_maxagi; /* highest inode alloc group */
334 uint m_ihsize; /* size of next field */ 334 size_t m_ihsize; /* size of next field */
335 struct xfs_ihash *m_ihash; /* fs private inode hash table*/ 335 struct xfs_ihash *m_ihash; /* fs private inode hash table*/
336 struct xfs_inode *m_inodes; /* active inode list */ 336 struct xfs_inode *m_inodes; /* active inode list */
337 struct list_head m_del_inodes; /* inodes to reclaim */ 337 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(
1922 } 1922 }
1923 1923
1924 if (mp->m_flags & XFS_MOUNT_IHASHSIZE) 1924 if (mp->m_flags & XFS_MOUNT_IHASHSIZE)
1925 seq_printf(m, "," MNTOPT_IHASHSIZE "=%d", mp->m_ihsize); 1925 seq_printf(m, "," MNTOPT_IHASHSIZE "=%d", (int)mp->m_ihsize);
1926 1926
1927 if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE) 1927 if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)
1928 seq_printf(m, "," MNTOPT_ALLOCSIZE "=%dk", 1928 seq_printf(m, "," MNTOPT_ALLOCSIZE "=%dk",