ntfs: change mft_no type to u64

Changes the type of ntfs_inode::mft_no from unsigned long to u64
to safely handle the full 48-bit range without truncation risk, especially
in preparation for broader VFS inode number type (i_ino:u64) and to
improve consistency with ntfs driver practices.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>

Author: namjaejeon

fs/ntfs/aops.c

@@ -96,7 +96,7 @@ static sector_t ntfs_bmap(struct address_space *mapping, sector_t block)
 	unsigned int delta;
 	unsigned char blocksize_bits;
 
-	ntfs_debug("Entering for mft_no 0x%lx, logical block 0x%llx.",
+	ntfs_debug("Entering for mft_no 0x%llx, logical block 0x%llx.",
 			ni->mft_no, (unsigned long long)block);
 	if (ni->type != AT_DATA || !NInoNonResident(ni) || NInoEncrypted(ni) ||
 	    NInoMstProtected(ni)) {
@@ -144,12 +144,12 @@ static sector_t ntfs_bmap(struct address_space *mapping, sector_t block)
 			goto hole;
 		case LCN_ENOMEM:
 			ntfs_error(vol->sb,
-				"Not enough memory to complete mapping for inode 0x%lx. Returning 0.",
+				"Not enough memory to complete mapping for inode 0x%llx. Returning 0.",
 				ni->mft_no);
 			break;
 		default:
 			ntfs_error(vol->sb,
-				"Failed to complete mapping for inode 0x%lx.  Run chkdsk. Returning 0.",
+				"Failed to complete mapping for inode 0x%llx.  Run chkdsk. Returning 0.",
 				ni->mft_no);
 			break;
 		}

fs/ntfs/attrib.c

@@ -370,7 +370,7 @@ s64 ntfs_attr_vcn_to_lcn_nolock(struct ntfs_inode *ni, const s64 vcn,
 	unsigned long flags;
 	bool is_retry = false;
 
-	ntfs_debug("Entering for i_ino 0x%lx, vcn 0x%llx, %s_locked.",
+	ntfs_debug("Entering for i_ino 0x%llx, vcn 0x%llx, %s_locked.",
 			ni->mft_no, (unsigned long long)vcn,
 			write_locked ? "write" : "read");
 	if (!ni->runlist.rl) {
@@ -521,7 +521,7 @@ struct runlist_element *ntfs_attr_find_vcn_nolock(struct ntfs_inode *ni, const s
 	int err = 0;
 	bool is_retry = false;
 
-	ntfs_debug("Entering for i_ino 0x%lx, vcn 0x%llx, with%s ctx.",
+	ntfs_debug("Entering for i_ino 0x%llx, vcn 0x%llx, with%s ctx.",
 			ni->mft_no, (unsigned long long)vcn, ctx ? "" : "out");
 	if (!ni->runlist.rl) {
 		read_lock_irqsave(&ni->size_lock, flags);
@@ -679,8 +679,8 @@ static int ntfs_attr_find(const __le32 type, const __le16 *name,
 			if (a->name_length && ((le16_to_cpu(a->name_offset) +
 					       a->name_length * sizeof(__le16)) >
 						le32_to_cpu(a->length))) {
-				ntfs_error(vol->sb, "Corrupt attribute name in MFT record %lld\n",
-					   (long long)ctx->ntfs_ino->mft_no);
+				ntfs_error(vol->sb, "Corrupt attribute name in MFT record %llu\n",
+					   ctx->ntfs_ino->mft_no);
 				break;
 			}
 
@@ -790,15 +790,15 @@ int load_attribute_list(struct ntfs_inode *base_ni, u8 *al_start, const s64 size
 	attr_vi = ntfs_attr_iget(VFS_I(base_ni), AT_ATTRIBUTE_LIST, AT_UNNAMED, 0);
 	if (IS_ERR(attr_vi)) {
 		ntfs_error(base_ni->vol->sb,
-			   "Failed to open an inode for Attribute list, mft = %ld",
+			   "Failed to open an inode for Attribute list, mft = %llu",
 			   base_ni->mft_no);
 		return PTR_ERR(attr_vi);
 	}
 
 	if (ntfs_inode_attr_pread(attr_vi, 0, size, al_start) != size) {
 		iput(attr_vi);
 		ntfs_error(base_ni->vol->sb,
-			   "Failed to read attribute list, mft = %ld",
+			   "Failed to read attribute list, mft = %llu",
 			   base_ni->mft_no);
 		return -EIO;
 	}
@@ -817,7 +817,7 @@ int load_attribute_list(struct ntfs_inode *base_ni, u8 *al_start, const s64 size
 			break;
 	}
 	if (al != al_start + size) {
-		ntfs_error(base_ni->vol->sb, "Corrupt attribute list, mft = %ld",
+		ntfs_error(base_ni->vol->sb, "Corrupt attribute list, mft = %llu",
 			   base_ni->mft_no);
 		return -EIO;
 	}
@@ -890,7 +890,7 @@ static int ntfs_external_attr_find(const __le32 type,
 	int err = 0;
 	static const char *es = " Unmount and run chkdsk.";
 
-	ntfs_debug("Entering for inode 0x%lx, type 0x%x.", ni->mft_no, type);
+	ntfs_debug("Entering for inode 0x%llx, type 0x%x.", ni->mft_no, type);
 	if (!base_ni) {
 		/* First call happens with the base mft record. */
 		base_ni = ctx->base_ntfs_ino = ctx->ntfs_ino;
@@ -1090,7 +1090,7 @@ static int ntfs_external_attr_find(const __le32 type,
 		if (MREF_LE(al_entry->mft_reference) == ni->mft_no) {
 			if (MSEQNO_LE(al_entry->mft_reference) != ni->seq_no) {
 				ntfs_error(vol->sb,
-					"Found stale mft reference in attribute list of base inode 0x%lx.%s",
+					"Found stale mft reference in attribute list of base inode 0x%llx.%s",
 					base_ni->mft_no, es);
 				err = -EIO;
 				break;
@@ -1112,7 +1112,7 @@ static int ntfs_external_attr_find(const __le32 type,
 						al_entry->mft_reference), &ni);
 				if (IS_ERR(ctx->mrec)) {
 					ntfs_error(vol->sb,
-							"Failed to map extent mft record 0x%lx of base inode 0x%lx.%s",
+							"Failed to map extent mft record 0x%lx of base inode 0x%llx.%s",
 							MREF_LE(al_entry->mft_reference),
 							base_ni->mft_no, es);
 					err = PTR_ERR(ctx->mrec);
@@ -1201,7 +1201,7 @@ static int ntfs_external_attr_find(const __le32 type,
 
 	if (!err) {
 		ntfs_error(vol->sb,
-			"Base inode 0x%lx contains corrupt attribute list attribute.%s",
+			"Base inode 0x%llx contains corrupt attribute list attribute.%s",
 			base_ni->mft_no, es);
 		err = -EIO;
 	}
@@ -3497,7 +3497,7 @@ int ntfs_attr_update_mapping_pairs(struct ntfs_inode *ni, s64 from_vcn)
 		 * delete extent) and continue search.
 		 */
 		if (finished_build) {
-			ntfs_debug("Mark attr 0x%x for delete in inode 0x%lx.\n",
+			ntfs_debug("Mark attr 0x%x for delete in inode 0x%llx.\n",
 				(unsigned int)le32_to_cpu(a->type), ctx->ntfs_ino->mft_no);
 			a->data.non_resident.highest_vcn = cpu_to_le64(NTFS_VCN_DELETE_MARK);
 			mark_mft_record_dirty(ctx->ntfs_ino);
@@ -4728,7 +4728,7 @@ int ntfs_attr_map_cluster(struct ntfs_inode *ni, s64 vcn_start, s64 *lcn_start,
 			CASE_SENSITIVE, vcn, NULL, 0, ctx);
 	if (err) {
 		ntfs_error(vol->sb,
-			   "ntfs_attr_lookup failed, ntfs inode(mft_no : %ld) type : 0x%x, err : %d",
+			   "ntfs_attr_lookup failed, ntfs inode(mft_no : %llu) type : 0x%x, err : %d",
 			   ni->mft_no, ni->type, err);
 		goto out;
 	}

fs/ntfs/compress.c

@@ -797,7 +797,7 @@ int ntfs_read_compressed_block(struct folio *folio)
 		 */
 		if (err) {
 			ntfs_error(vol->sb,
-				"ntfs_decompress() failed in inode 0x%lx with error code %i. Skipping this compression block.",
+				"ntfs_decompress() failed in inode 0x%llx with error code %i. Skipping this compression block.",
 				ni->mft_no, -err);
 			/* Release the unfinished pages. */
 			for (; prev_cur_page < cur_page; prev_cur_page++) {
@@ -823,7 +823,7 @@ int ntfs_read_compressed_block(struct folio *folio)
 		page = pages[cur_page];
 		if (page) {
 			ntfs_error(vol->sb,
-				"Still have pages left! Terminating them with extreme prejudice.  Inode 0x%lx, page index 0x%lx.",
+				"Still have pages left! Terminating them with extreme prejudice.  Inode 0x%llx, page index 0x%lx.",
 				ni->mft_no, page->__folio_index);
 			flush_dcache_page(page);
 			kunmap_local(page_address(page));

fs/ntfs/dir.c

@@ -102,7 +102,7 @@ u64 ntfs_lookup_inode_by_name(struct ntfs_inode *dir_ni, const __le16 *uname,
 	if (unlikely(err)) {
 		if (err == -ENOENT) {
 			ntfs_error(sb,
-				"Index root attribute missing in directory inode 0x%lx.",
+				"Index root attribute missing in directory inode 0x%llx.",
 				dir_ni->mft_no);
 			err = -EIO;
 		}
@@ -338,45 +338,45 @@ u64 ntfs_lookup_inode_by_name(struct ntfs_inode *dir_ni, const __le16 *uname,
 	/* Bounds checks. */
 	if ((u8 *)ia < kaddr || (u8 *)ia > kaddr + PAGE_SIZE) {
 		ntfs_error(sb,
-			"Out of bounds check failed. Corrupt directory inode 0x%lx or driver bug.",
+			"Out of bounds check failed. Corrupt directory inode 0x%llx or driver bug.",
 			dir_ni->mft_no);
 		goto unm_err_out;
 	}
 	/* Catch multi sector transfer fixup errors. */
 	if (unlikely(!ntfs_is_indx_record(ia->magic))) {
 		ntfs_error(sb,
-			"Directory index record with vcn 0x%llx is corrupt.  Corrupt inode 0x%lx.  Run chkdsk.",
-			(unsigned long long)vcn, dir_ni->mft_no);
+			"Directory index record with vcn 0x%llx is corrupt.  Corrupt inode 0x%llx.  Run chkdsk.",
+			vcn, dir_ni->mft_no);
 		goto unm_err_out;
 	}
 	if (le64_to_cpu(ia->index_block_vcn) != vcn) {
 		ntfs_error(sb,
-			"Actual VCN (0x%llx) of index buffer is different from expected VCN (0x%llx). Directory inode 0x%lx is corrupt or driver bug.",
-			(unsigned long long)le64_to_cpu(ia->index_block_vcn),
-			(unsigned long long)vcn, dir_ni->mft_no);
+			"Actual VCN (0x%llx) of index buffer is different from expected VCN (0x%llx). Directory inode 0x%llx is corrupt or driver bug.",
+			le64_to_cpu(ia->index_block_vcn),
+			vcn, dir_ni->mft_no);
 		goto unm_err_out;
 	}
 	if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
 			dir_ni->itype.index.block_size) {
 		ntfs_error(sb,
-			"Index buffer (VCN 0x%llx) of directory inode 0x%lx has a size (%u) differing from the directory specified size (%u). Directory inode is corrupt or driver bug.",
-			(unsigned long long)vcn, dir_ni->mft_no,
+			"Index buffer (VCN 0x%llx) of directory inode 0x%llx has a size (%u) differing from the directory specified size (%u). Directory inode is corrupt or driver bug.",
+			vcn, dir_ni->mft_no,
 			le32_to_cpu(ia->index.allocated_size) + 0x18,
 			dir_ni->itype.index.block_size);
 		goto unm_err_out;
 	}
 	index_end = (u8 *)ia + dir_ni->itype.index.block_size;
 	if (index_end > kaddr + PAGE_SIZE) {
 		ntfs_error(sb,
-			"Index buffer (VCN 0x%llx) of directory inode 0x%lx crosses page boundary. Impossible! Cannot access! This is probably a bug in the driver.",
-			(unsigned long long)vcn, dir_ni->mft_no);
+			"Index buffer (VCN 0x%llx) of directory inode 0x%llx crosses page boundary. Impossible! Cannot access! This is probably a bug in the driver.",
+			vcn, dir_ni->mft_no);
 		goto unm_err_out;
 	}
 	index_end = (u8 *)&ia->index + le32_to_cpu(ia->index.index_length);
 	if (index_end > (u8 *)ia + dir_ni->itype.index.block_size) {
 		ntfs_error(sb,
-			"Size of index buffer (VCN 0x%llx) of directory inode 0x%lx exceeds maximum size.",
-			(unsigned long long)vcn, dir_ni->mft_no);
+			"Size of index buffer (VCN 0x%llx) of directory inode 0x%llx exceeds maximum size.",
+			vcn, dir_ni->mft_no);
 		goto unm_err_out;
 	}
 	/* The first index entry. */
@@ -393,7 +393,7 @@ u64 ntfs_lookup_inode_by_name(struct ntfs_inode *dir_ni, const __le16 *uname,
 		    (u8 *)ie + sizeof(struct index_entry_header) > index_end ||
 		    (u8 *)ie + sizeof(struct index_entry_header) + le16_to_cpu(ie->key_length) >
 				index_end || (u8 *)ie + le16_to_cpu(ie->length) > index_end) {
-			ntfs_error(sb, "Index entry out of bounds in directory inode 0x%lx.",
+			ntfs_error(sb, "Index entry out of bounds in directory inode 0x%llx.",
 					dir_ni->mft_no);
 			goto unm_err_out;
 		}
@@ -546,7 +546,7 @@ u64 ntfs_lookup_inode_by_name(struct ntfs_inode *dir_ni, const __le16 *uname,
 	if (ie->flags & INDEX_ENTRY_NODE) {
 		if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
 			ntfs_error(sb,
-				"Index entry with child node found in a leaf node in directory inode 0x%lx.",
+				"Index entry with child node found in a leaf node in directory inode 0x%llx.",
 				dir_ni->mft_no);
 			goto unm_err_out;
 		}
@@ -566,7 +566,7 @@ u64 ntfs_lookup_inode_by_name(struct ntfs_inode *dir_ni, const __le16 *uname,
 			kaddr = NULL;
 			goto descend_into_child_node;
 		}
-		ntfs_error(sb, "Negative child node vcn in directory inode 0x%lx.",
+		ntfs_error(sb, "Negative child node vcn in directory inode 0x%llx.",
 				dir_ni->mft_no);
 		goto unm_err_out;
 	}
@@ -863,7 +863,7 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)
 	/* Find the index root attribute in the mft record. */
 	if (ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL, 0,
 				ctx)) {
-		ntfs_error(sb, "Index root attribute missing in directory inode %ld",
+		ntfs_error(sb, "Index root attribute missing in directory inode %llu",
 				ndir->mft_no);
 		ntfs_attr_put_search_ctx(ctx);
 		err = -ENOMEM;
@@ -1062,8 +1062,8 @@ int ntfs_check_empty_dir(struct ntfs_inode *ni, struct mft_record *ni_mrec)
 	ret = ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,
 				0, ctx);
 	if (ret) {
-		ntfs_error(ni->vol->sb, "Index root attribute missing in directory inode %lld",
-				(unsigned long long)ni->mft_no);
+		ntfs_error(ni->vol->sb, "Index root attribute missing in directory inode %llu",
+				ni->mft_no);
 		ntfs_attr_put_search_ctx(ctx);
 		return ret;
 	}