Unverified Commit 0e59a87e authored by Kari Argillander's avatar Kari Argillander Committed by Konstantin Komarov
Browse files

fs/ntfs3: 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: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 0056b273

fs/ntfs3/super.c

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