From 28861e3bbd9e7ac4cd9c811aad71b4d116e27930 Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Thu, 9 Sep 2021 21:09:42 +0300

Subject: [Backport 28861e3bbd9e] src: Initiliaze sb blocksize only in one

 place + refactor

Right now sb blocksize first get initiliazed in fill_super but in can be

changed in helper function. It makes more sense to that this happened

only in one place.

Because we move this to helper function it makes more sense that

s_maxbytes will also be there. I rather have every sb releted thing in

fill_super, but because there is already sb releted stuff in this

helper. This will have to do for now.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/super.c | 13 +++----------

 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/super.c b/src/super.c

index 3d034eac2bd197408e7e64a279799d68ad1a8129..cefb9ddaf4db78890e9dc389416f47323bf33bcd 100644

--- a/src/super.c

+++ b/src/super.c

@@ -840,8 +840,7 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,

 	rec->total = cpu_to_le32(sbi->record_size);

 	((struct ATTRIB *)Add2Ptr(rec, ao))->type = ATTR_END;

-	if (sbi->cluster_size < PAGE_SIZE)

-		sb_set_blocksize(sb, sbi->cluster_size);

+	sb_set_blocksize(sb, min_t(u32, sbi->cluster_size, PAGE_SIZE));

 	sbi->block_mask = sb->s_blocksize - 1;

 	sbi->blocks_per_cluster = sbi->cluster_size >> sb->s_blocksize_bits;

@@ -854,9 +853,11 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,

 	if (clusters >= (1ull << (64 - sbi->cluster_bits)))

 		sbi->maxbytes = -1;

 	sbi->maxbytes_sparse = -1;

+	sb->s_maxbytes = MAX_LFS_FILESIZE;

 #else

 	/* Maximum size for sparse file. */

 	sbi->maxbytes_sparse = (1ull << (sbi->cluster_bits + 32)) - 1;

+	sb->s_maxbytes = 0xFFFFFFFFull << sbi->cluster_bits;

 #endif

 	err = 0;

@@ -911,20 +912,12 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 			~(u64)(sbi->discard_granularity - 1);

 	}

-	sb_set_blocksize(sb, PAGE_SIZE);

-

 	/* Parse boot. */

 	err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512,

 				  bdev->bd_inode->i_size);

 	if (err)

 		return err;

-#ifdef CONFIG_NTFS3_64BIT_CLUSTER

-	sb->s_maxbytes = MAX_LFS_FILESIZE;

-#else

-	sb->s_maxbytes = 0xFFFFFFFFull << sbi->cluster_bits;

-#endif

-

 	/*

 	 * Load $Volume. This should be done before $LogFile

 	 * 'cause 'sbi->volume.ni' is used 'ntfs_set_state'.

-- 

2.31.1