Commit 8907547d4b099e67762ea4891c127ea1f6dd1cb7
Committed by
Anton Altaparmakov
Anton Altaparmakov
1 parent
5ae9fcf8f3
Exists in
master
and in
4 other branches
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>
Showing 6 changed files with 20 additions and 15 deletions Side-by-side Diff
fs/ntfs/ChangeLog
| ... | ... | @@ -29,6 +29,7 @@ |
| 29 | 29 | compiled without debug. This avoids a possible denial of service |
| 30 | 30 | attack. Thanks to Carl-Daniel Hailfinger from SuSE for pointing this |
| 31 | 31 | out. |
| 32 | + - Fix compilation warnings on ia64. (Randy Dunlap) | |
| 32 | 33 | - Use i_size_read() in fs/ntfs/attrib.c::ntfs_attr_set(). |
| 33 | 34 | - Use i_size_read() in fs/ntfs/logfile.c::ntfs_{check,empty}_logfile(). |
| 34 | 35 | - Use i_size_read() once and then use the cached value in |
fs/ntfs/aops.c
| ... | ... | @@ -965,7 +965,8 @@ |
| 965 | 965 | "attribute type 0x%x) because " |
| 966 | 966 | "its location on disk could " |
| 967 | 967 | "not be determined (error " |
| 968 | - "code %lli).", (s64)block << | |
| 968 | + "code %lli).", | |
| 969 | + (long long)block << | |
| 969 | 970 | bh_size_bits >> |
| 970 | 971 | vol->mft_record_size_bits, |
| 971 | 972 | ni->mft_no, ni->type, |
fs/ntfs/debug.c
| ... | ... | @@ -164,14 +164,17 @@ |
| 164 | 164 | if (index > -LCN_ENOENT - 1) |
| 165 | 165 | index = 3; |
| 166 | 166 | printk(KERN_DEBUG "%-16Lx %s %-16Lx%s\n", |
| 167 | - (rl + i)->vcn, lcn_str[index], | |
| 168 | - (rl + i)->length, (rl + i)->length ? | |
| 169 | - "" : " (runlist end)"); | |
| 167 | + (long long)(rl + i)->vcn, lcn_str[index], | |
| 168 | + (long long)(rl + i)->length, | |
| 169 | + (rl + i)->length ? "" : | |
| 170 | + " (runlist end)"); | |
| 170 | 171 | } else |
| 171 | 172 | printk(KERN_DEBUG "%-16Lx %-16Lx %-16Lx%s\n", |
| 172 | - (rl + i)->vcn, (rl + i)->lcn, | |
| 173 | - (rl + i)->length, (rl + i)->length ? | |
| 174 | - "" : " (runlist end)"); | |
| 173 | + (long long)(rl + i)->vcn, | |
| 174 | + (long long)(rl + i)->lcn, | |
| 175 | + (long long)(rl + i)->length, | |
| 176 | + (rl + i)->length ? "" : | |
| 177 | + " (runlist end)"); | |
| 175 | 178 | if (!(rl + i)->length) |
| 176 | 179 | break; |
| 177 | 180 | } |
fs/ntfs/inode.c
| ... | ... | @@ -2518,18 +2518,18 @@ |
| 2518 | 2518 | nt = utc2ntfs(vi->i_mtime); |
| 2519 | 2519 | if (si->last_data_change_time != nt) { |
| 2520 | 2520 | ntfs_debug("Updating mtime for inode 0x%lx: old = 0x%llx, " |
| 2521 | - "new = 0x%llx", vi->i_ino, | |
| 2521 | + "new = 0x%llx", vi->i_ino, (long long) | |
| 2522 | 2522 | sle64_to_cpu(si->last_data_change_time), |
| 2523 | - sle64_to_cpu(nt)); | |
| 2523 | + (long long)sle64_to_cpu(nt)); | |
| 2524 | 2524 | si->last_data_change_time = nt; |
| 2525 | 2525 | modified = TRUE; |
| 2526 | 2526 | } |
| 2527 | 2527 | nt = utc2ntfs(vi->i_ctime); |
| 2528 | 2528 | if (si->last_mft_change_time != nt) { |
| 2529 | 2529 | ntfs_debug("Updating ctime for inode 0x%lx: old = 0x%llx, " |
| 2530 | - "new = 0x%llx", vi->i_ino, | |
| 2530 | + "new = 0x%llx", vi->i_ino, (long long) | |
| 2531 | 2531 | sle64_to_cpu(si->last_mft_change_time), |
| 2532 | - sle64_to_cpu(nt)); | |
| 2532 | + (long long)sle64_to_cpu(nt)); | |
| 2533 | 2533 | si->last_mft_change_time = nt; |
| 2534 | 2534 | modified = TRUE; |
| 2535 | 2535 | } |
| ... | ... | @@ -2537,8 +2537,8 @@ |
| 2537 | 2537 | if (si->last_access_time != nt) { |
| 2538 | 2538 | ntfs_debug("Updating atime for inode 0x%lx: old = 0x%llx, " |
| 2539 | 2539 | "new = 0x%llx", vi->i_ino, |
| 2540 | - sle64_to_cpu(si->last_access_time), | |
| 2541 | - sle64_to_cpu(nt)); | |
| 2540 | + (long long)sle64_to_cpu(si->last_access_time), | |
| 2541 | + (long long)sle64_to_cpu(nt)); | |
| 2542 | 2542 | si->last_access_time = nt; |
| 2543 | 2543 | modified = TRUE; |
| 2544 | 2544 | } |
fs/ntfs/lcnalloc.c
| ... | ... | @@ -763,7 +763,7 @@ |
| 763 | 763 | "could allocate up to 0x%llx " |
| 764 | 764 | "clusters.", |
| 765 | 765 | (unsigned long long)rl[0].lcn, |
| 766 | - (unsigned long long)count - clusters); | |
| 766 | + (unsigned long long)(count - clusters)); | |
| 767 | 767 | /* Deallocate all allocated clusters. */ |
| 768 | 768 | ntfs_debug("Attempting rollback..."); |
| 769 | 769 | err2 = ntfs_cluster_free_from_rl_nolock(vol, rl); |
fs/ntfs/mft.c
| ... | ... | @@ -1802,7 +1802,7 @@ |
| 1802 | 1802 | return PTR_ERR(rl); |
| 1803 | 1803 | } |
| 1804 | 1804 | mft_ni->runlist.rl = rl; |
| 1805 | - ntfs_debug("Allocated %lli clusters.", nr); | |
| 1805 | + ntfs_debug("Allocated %lli clusters.", (long long)nr); | |
| 1806 | 1806 | /* Find the last run in the new runlist. */ |
| 1807 | 1807 | for (; rl[1].length; rl++) |
| 1808 | 1808 | ; |