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:
           for highly fragmented files, i.e. ones whose data attribute is split
           across multiple extents.   When such a case is encountered,
           EOPNOTSUPP is returned.
-        - $EA attributes can be both resident non-resident.
+        - $EA attributes can be both resident and non-resident.
+        - Use %z for size_t to fix compilation warnings.  (Andrew Morton)
 
 2.1.24 - Lots of bug fixes and support more clean journal states.
 
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,
         ni = NTFS_I(vi);
         vol = ni->vol;
         ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
-                        "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%x.",
+                        "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",
                         vi->i_ino, ni->type, pages[0]->index, nr_pages,
                         (long long)pos, bytes);
         blocksize_bits = vi->i_blkbits;
@@ -1693,7 +1693,7 @@ static int ntfs_commit_pages_after_write(struct page **pages,
         vi = page->mapping->host;
         ni = NTFS_I(vi);
         ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
-                        "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%x.",
+                        "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.",
                         vi->i_ino, ni->type, page->index, nr_pages,
                         (long long)pos, bytes);
         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:
         if (unlikely(i_size_read(tmp_ino) < sizeof(USN_HEADER))) {
                 ntfs_error(vol->sb, "Found corrupt $UsnJrnl/$DATA/$Max "
                                 "attribute (size is 0x%llx but should be at "
-                                "least 0x%x bytes).", i_size_read(tmp_ino),
+                                "least 0x%zx bytes).", i_size_read(tmp_ino),
                                 sizeof(USN_HEADER));
                 return FALSE;
         }