NTFS: Fix printk format warnings on ia64. (Randy Dunlap)

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
This commit is contained in:
Randy Dunlap 2005-03-03 11:19:53 +00:00 committed by Anton Altaparmakov
parent 5ae9fcf8f3
commit 8907547d4b
6 changed files with 20 additions and 15 deletions

View File

@ -29,6 +29,7 @@ ToDo/Notes:
compiled without debug. This avoids a possible denial of service
attack. Thanks to Carl-Daniel Hailfinger from SuSE for pointing this
out.
- Fix compilation warnings on ia64. (Randy Dunlap)
- Use i_size_read() in fs/ntfs/attrib.c::ntfs_attr_set().
- Use i_size_read() in fs/ntfs/logfile.c::ntfs_{check,empty}_logfile().
- Use i_size_read() once and then use the cached value in

View File

@ -965,7 +965,8 @@ static int ntfs_write_mst_block(struct page *page,
"attribute type 0x%x) because "
"its location on disk could "
"not be determined (error "
"code %lli).", (s64)block <<
"code %lli).",
(long long)block <<
bh_size_bits >>
vol->mft_record_size_bits,
ni->mft_no, ni->type,

View File

@ -164,14 +164,17 @@ void ntfs_debug_dump_runlist(const runlist_element *rl)
if (index > -LCN_ENOENT - 1)
index = 3;
printk(KERN_DEBUG "%-16Lx %s %-16Lx%s\n",
(rl + i)->vcn, lcn_str[index],
(rl + i)->length, (rl + i)->length ?
"" : " (runlist end)");
(long long)(rl + i)->vcn, lcn_str[index],
(long long)(rl + i)->length,
(rl + i)->length ? "" :
" (runlist end)");
} else
printk(KERN_DEBUG "%-16Lx %-16Lx %-16Lx%s\n",
(rl + i)->vcn, (rl + i)->lcn,
(rl + i)->length, (rl + i)->length ?
"" : " (runlist end)");
(long long)(rl + i)->vcn,
(long long)(rl + i)->lcn,
(long long)(rl + i)->length,
(rl + i)->length ? "" :
" (runlist end)");
if (!(rl + i)->length)
break;
}

View File

@ -2518,18 +2518,18 @@ int ntfs_write_inode(struct inode *vi, int sync)
nt = utc2ntfs(vi->i_mtime);
if (si->last_data_change_time != nt) {
ntfs_debug("Updating mtime for inode 0x%lx: old = 0x%llx, "
"new = 0x%llx", vi->i_ino,
"new = 0x%llx", vi->i_ino, (long long)
sle64_to_cpu(si->last_data_change_time),
sle64_to_cpu(nt));
(long long)sle64_to_cpu(nt));
si->last_data_change_time = nt;
modified = TRUE;
}
nt = utc2ntfs(vi->i_ctime);
if (si->last_mft_change_time != nt) {
ntfs_debug("Updating ctime for inode 0x%lx: old = 0x%llx, "
"new = 0x%llx", vi->i_ino,
"new = 0x%llx", vi->i_ino, (long long)
sle64_to_cpu(si->last_mft_change_time),
sle64_to_cpu(nt));
(long long)sle64_to_cpu(nt));
si->last_mft_change_time = nt;
modified = TRUE;
}
@ -2537,8 +2537,8 @@ int ntfs_write_inode(struct inode *vi, int sync)
if (si->last_access_time != nt) {
ntfs_debug("Updating atime for inode 0x%lx: old = 0x%llx, "
"new = 0x%llx", vi->i_ino,
sle64_to_cpu(si->last_access_time),
sle64_to_cpu(nt));
(long long)sle64_to_cpu(si->last_access_time),
(long long)sle64_to_cpu(nt));
si->last_access_time = nt;
modified = TRUE;
}

View File

@ -763,7 +763,7 @@ switch_to_data1_zone: search_zone = 2;
"could allocate up to 0x%llx "
"clusters.",
(unsigned long long)rl[0].lcn,
(unsigned long long)count - clusters);
(unsigned long long)(count - clusters));
/* Deallocate all allocated clusters. */
ntfs_debug("Attempting rollback...");
err2 = ntfs_cluster_free_from_rl_nolock(vol, rl);

View File

@ -1802,7 +1802,7 @@ static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
return PTR_ERR(rl);
}
mft_ni->runlist.rl = rl;
ntfs_debug("Allocated %lli clusters.", nr);
ntfs_debug("Allocated %lli clusters.", (long long)nr);
/* Find the last run in the new runlist. */
for (; rl[1].length; rl++)
;