浏览代码

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>
Anton Altaparmakov 19 年之前
父节点
当前提交
d04bd1fb60
共有 3 个文件被更改,包括 5 次插入4 次删除
  1. 2 1
      fs/ntfs/ChangeLog
  2. 2 2
      fs/ntfs/file.c
  3. 1 1
      fs/ntfs/super.c

+ 2 - 1
fs/ntfs/ChangeLog

@@ -75,7 +75,8 @@ ToDo/Notes:
 	  for highly fragmented files, i.e. ones whose data attribute is split
 	  for highly fragmented files, i.e. ones whose data attribute is split
 	  across multiple extents.   When such a case is encountered,
 	  across multiple extents.   When such a case is encountered,
 	  EOPNOTSUPP is returned.
 	  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.
 2.1.24 - Lots of bug fixes and support more clean journal states.
 
 

+ 2 - 2
fs/ntfs/file.c

@@ -531,7 +531,7 @@ static int ntfs_prepare_pages_for_non_resident_write(struct page **pages,
 	ni = NTFS_I(vi);
 	ni = NTFS_I(vi);
 	vol = ni->vol;
 	vol = ni->vol;
 	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
 	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,
 			vi->i_ino, ni->type, pages[0]->index, nr_pages,
 			(long long)pos, bytes);
 			(long long)pos, bytes);
 	blocksize_bits = vi->i_blkbits;
 	blocksize_bits = vi->i_blkbits;
@@ -1693,7 +1693,7 @@ static int ntfs_commit_pages_after_write(struct page **pages,
 	vi = page->mapping->host;
 	vi = page->mapping->host;
 	ni = NTFS_I(vi);
 	ni = NTFS_I(vi);
 	ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, start page "
 	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,
 			vi->i_ino, ni->type, page->index, nr_pages,
 			(long long)pos, bytes);
 			(long long)pos, bytes);
 	if (NInoNonResident(ni))
 	if (NInoNonResident(ni))

+ 1 - 1
fs/ntfs/super.c

@@ -1447,7 +1447,7 @@ not_enabled:
 	if (unlikely(i_size_read(tmp_ino) < sizeof(USN_HEADER))) {
 	if (unlikely(i_size_read(tmp_ino) < sizeof(USN_HEADER))) {
 		ntfs_error(vol->sb, "Found corrupt $UsnJrnl/$DATA/$Max "
 		ntfs_error(vol->sb, "Found corrupt $UsnJrnl/$DATA/$Max "
 				"attribute (size is 0x%llx but should be at "
 				"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));
 				sizeof(USN_HEADER));
 		return FALSE;
 		return FALSE;
 	}
 	}