diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-26 06:57:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-26 06:57:19 -0700 |
| commit | e7adc6811bb4da24d032fedee0a34d88768e50a9 (patch) | |
| tree | f19ae14398c81a6f7757ec2e6f0a9fa74861b6f0 /fs | |
| parent | fe29f76813961a6ab41044b771d6fc944f7939bb (diff) | |
| download | history-e7adc6811bb4da24d032fedee0a34d88768e50a9.tar.gz | |
[PATCH] size_t portability fixes
A lot of places assumed that size_t == unsigned; on 64bit boxen that is not
true.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/erase.c | 2 | ||||
| -rw-r--r-- | fs/jffs2/gc.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/compress.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/dir.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/super.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index 4856f369c38552..f6efdbabbf3e20 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -402,7 +402,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb goto bad2; } if (retlen != sizeof(marker)) { - printk(KERN_WARNING "Short write to newly-erased block at 0x%08x: Wanted %d, got %zd\n", + printk(KERN_WARNING "Short write to newly-erased block at 0x%08x: Wanted %zd, got %zd\n", jeb->offset, sizeof(marker), retlen); goto bad2; } diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c index f4d16ad9c9adee..dc25d812a3c0f4 100644 --- a/fs/jffs2/gc.c +++ b/fs/jffs2/gc.c @@ -824,7 +824,7 @@ static int jffs2_garbage_collect_deletion_dirent(struct jffs2_sb_info *c, struct continue; } if (retlen != rawlen) { - printk(KERN_WARNING "jffs2_g_c_deletion_dirent(): Short read (%zd not %zd) reading header from obsolete node at %08x\n", + printk(KERN_WARNING "jffs2_g_c_deletion_dirent(): Short read (%zd not %u) reading header from obsolete node at %08x\n", retlen, rawlen, ref_offset(raw)); continue; } diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index f9aca53c71028e..c39391bab1d944 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c @@ -195,7 +195,7 @@ static int ntfs_decompress(struct page *dest_pages[], int *dest_index, ntfs_debug("Entering, cb_size = 0x%x.", cb_size); do_next_sb: - ntfs_debug("Beginning sub-block at offset = 0x%x in the cb.", + ntfs_debug("Beginning sub-block at offset = 0x%zx in the cb.", cb - cb_start); /* * Have we reached the end of the compression block or the end of the diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index aad3a12b3bf379..24686227960ca3 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c @@ -1222,7 +1222,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir) * or signals an error (both covered by the rc test). */ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) { - ntfs_debug("In index root, offset 0x%x.", (u8*)ie - (u8*)ir); + ntfs_debug("In index root, offset 0x%zx.", (u8*)ie - (u8*)ir); /* Bounds checks. */ if (unlikely((u8*)ie < (u8*)ir || (u8*)ie + sizeof(INDEX_ENTRY_HEADER) > index_end || diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index a0ca90d9d01d15..e49428592e0403 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -1190,7 +1190,7 @@ read_partial_upcase_page: goto read_partial_upcase_page; } vol->upcase_len = ino->i_size >> UCHAR_T_SIZE_BITS; - ntfs_debug("Read %llu bytes from $UpCase (expected %u bytes).", + ntfs_debug("Read %llu bytes from $UpCase (expected %zu bytes).", ino->i_size, 64 * 1024 * sizeof(ntfschar)); iput(ino); down(&ntfs_lock); |