Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04bd1fb authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

NTFS: Use %z for size_t to fix compilation warnings. (Andrew Morton) 



Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent d5aeaef3

fs/ntfs/ChangeLog

+2 −1
Original line number Diff line number Diff line
@@ -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.

fs/ntfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -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))

fs/ntfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}