Skip to content

Commit 0ce2a31

Browse files
fs/ntfs3: fix mount failure on 64K page-size kernels
On 64K page-size kernels, mounting NTFS volumes smaller than ~650 MB fails with EINVAL. The issue is in log_replay(): the initial log page size probe uses PAGE_SIZE (65536) instead of DefaultLogPageSize (4096) when PAGE_SIZE exceeds DefaultLogPageSize * 2. This makes norm_file_page() require the $LogFile to be at least 50 * 65536 = 3.2 MB, but mkfs.ntfs creates a $LogFile of only ~1.5 MB for a typical 300 MB volume. norm_file_page() returns 0 and the mount is rejected with EINVAL. On 4K kernels the #if guard evaluates to true, so use_default=true is passed and DefaultLogPageSize (4096) is used, requiring only ~200 KB. This path works fine. Fix this by always passing use_default=true, which forces the initial probe to use DefaultLogPageSize regardless of the kernel's PAGE_SIZE. This is safe because, after reading the on-disk restart area, log_replay() already re-adjusts log->page_size to match the volume's actual sys_page_size. Also fix read_log_page() to pass log->page_size instead of PAGE_SIZE to ntfs_fix_post_read(), matching the actual buffer size. Fixes: b46acd6 ("fs/ntfs3: Add NTFS journal") Tested-by: Matthew R. Ochs <mochs@nvidia.com> Signed-off-by: Jamie Nguyen <jamien@nvidia.com> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> (cherry picked from commit b7a9125cac8645245d2473c6c0a50e338280ad23 linux-next) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
1 parent 39a15f5 commit 0ce2a31

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

fs/ntfs3/fslog.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ static int read_log_page(struct ntfs_log *log, u32 vbo,
11721172
goto out;
11731173

11741174
if (page_buf->rhdr.sign != NTFS_FFFF_SIGNATURE)
1175-
ntfs_fix_post_read(&page_buf->rhdr, PAGE_SIZE, false);
1175+
ntfs_fix_post_read(&page_buf->rhdr, log->page_size, false);
11761176

11771177
if (page_buf != *buffer)
11781178
memcpy(*buffer, Add2Ptr(page_buf, page_off), bytes);
@@ -3786,11 +3786,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
37863786
log->l_size = log->orig_file_size = ni->vfs_inode.i_size;
37873787

37883788
/* Get the size of page. NOTE: To replay we can use default page. */
3789-
#if PAGE_SIZE >= DefaultLogPageSize && PAGE_SIZE <= DefaultLogPageSize * 2
37903789
log->page_size = norm_file_page(PAGE_SIZE, &log->l_size, true);
3791-
#else
3792-
log->page_size = norm_file_page(PAGE_SIZE, &log->l_size, false);
3793-
#endif
37943790
if (!log->page_size) {
37953791
err = -EINVAL;
37963792
goto out;

0 commit comments

Comments
 (0)