aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-24 03:41:24 -0400
committerAnton Altaparmakov <aia21@cantab.net>2005-10-24 03:41:24 -0400
commitd04bd1fb60252f30f4f41a56613ade48df130588 (patch)
tree53086f94589ecf35912e47fa14b8d8a5bc4714c0
parentd5aeaef37dc9cb009ab5cb8abf325338d21d2b1a (diff)
NTFS: Use %z for size_t to fix compilation warnings. (Andrew Morton)
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
-rw-r--r--fs/ntfs/ChangeLog3
-rw-r--r--fs/ntfs/file.c4
-rw-r--r--fs/ntfs/super.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index bc6ec16ad1f8..2a76b1fbbfc0 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -75,7 +75,8 @@ ToDo/Notes:
75 for highly fragmented files, i.e. ones whose data attribute is split 75 for highly fragmented files, i.e. ones whose data attribute is split
76 across multiple extents. When such a case is encountered, 76 across multiple extents. When such a case is encountered,
77 EOPNOTSUPP is returned. 77 EOPNOTSUPP is returned.
78 - $EA attributes can be both resident non-resident. 78 - $EA attributes can be both resident and non-resident.
79 - Use %z for size_t to fix compilation warnings. (Andrew Morton)
79 80
802.1.24 - Lots of bug fixes and support more clean journal states. 812.1.24 - Lots of bug fixes and support more clean journal states.
81 82
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index a142bf3ba1a5..cdedc84e1372 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -531,7 +531,7 @@ static int ntfs_prepare_pages_for_non_resident_write(struct page **pages,
531 ni = NTFS_I(vi); 531 ni = NTFS_I(vi);
532 vol = ni->vol; 532 vol = ni->vol;
533 ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page " 533 ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
534 "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%x.", 534 "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",
535 vi->i_ino, ni->type, pages[0]->index, nr_pages, 535 vi->i_ino, ni->type, pages[0]->index, nr_pages,
536 (long long)pos, bytes); 536 (long long)pos, bytes);
537 blocksize_bits = vi->i_blkbits; 537 blocksize_bits = vi->i_blkbits;
@@ -1693,7 +1693,7 @@ static int ntfs_commit_pages_after_write(struct page **pages,
1693 vi = page->mapping->host; 1693 vi = page->mapping->host;
1694 ni = NTFS_I(vi); 1694 ni = NTFS_I(vi);
1695 ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page " 1695 ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
1696 "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%x.", 1696 "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",
1697 vi->i_ino, ni->type, page->index, nr_pages, 1697 vi->i_ino, ni->type, page->index, nr_pages,
1698 (long long)pos, bytes); 1698 (long long)pos, bytes);
1699 if (NInoNonResident(ni)) 1699 if (NInoNonResident(ni))
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 453d0d51ea4b..6c16db9e1a8a 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1447,7 +1447,7 @@ not_enabled:
1447 if (unlikely(i_size_read(tmp_ino) < sizeof(USN_HEADER))) { 1447 if (unlikely(i_size_read(tmp_ino) < sizeof(USN_HEADER))) {
1448 ntfs_error(vol->sb, "Found corrupt $UsnJrnl/$DATA/$Max " 1448 ntfs_error(vol->sb, "Found corrupt $UsnJrnl/$DATA/$Max "
1449 "attribute (size is 0x%llx but should be at " 1449 "attribute (size is 0x%llx but should be at "
1450 "least 0x%x bytes).", i_size_read(tmp_ino), 1450 "least 0x%zx bytes).", i_size_read(tmp_ino),
1451 sizeof(USN_HEADER)); 1451 sizeof(USN_HEADER));
1452 return FALSE; 1452 return FALSE;
1453 } 1453 }