From 0e59a87ee619915c2eb189eb232a972c276681fb Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 0e59a87ee619] src: Initialize pointer before use place

 in fill_super

Initializing should be as close as possible when we use it so that

we do not need to scroll up to see what is happening.

Also bdev_get_queue() can never return NULL so we do not need to check

for !rq.

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

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

---

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

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

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

index 8ce0d4f439a1e26b9f12dbdab0fbb946da859adb..3d034eac2bd197408e7e64a279799d68ad1a8129 100644

--- a/src/super.c

+++ b/src/super.c

@@ -875,7 +875,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 	int err;

 	struct ntfs_sb_info *sbi = sb->s_fs_info;

 	struct block_device *bdev = sb->s_bdev;

-	struct request_queue *rq = bdev_get_queue(bdev);

+	struct request_queue *rq;

 	struct inode *inode;

 	struct ntfs_inode *ni;

 	size_t i, tt;

@@ -904,9 +904,8 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		return -EINVAL;

 	}

-	if (!rq || !blk_queue_discard(rq) || !rq->limits.discard_granularity) {

-		;

-	} else {

+	rq = bdev_get_queue(bdev);

+	if (blk_queue_discard(rq) && rq->limits.discard_granularity) {

 		sbi->discard_granularity = rq->limits.discard_granularity;

 		sbi->discard_granularity_mask_inv =

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

-- 

2.31.1