From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C8463FF0 for ; Thu, 9 Sep 2021 18:10:07 +0000 (UTC) Received: by mail-lj1-f176.google.com with SMTP id l18so4320327lji.12 for ; Thu, 09 Sep 2021 11:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+ZfipCwxhRp6Ie3Aw8psddkQkoxd2J2YHBmheHWPB+M=; b=kUOdeKUqJMNDgRmus6zXohIAtzc233o7W3lzXHUGyl7zkndtyB1FgmVsbZ1tYyw3JX yGZSFenrNgMzFjZJXwIFR7OQrrMEXwGejegAqaxSDpidIazAr2bcGhzDktfxORMpEmhF bFeKINoyNFY4RxaFhruu4Z3nSppUxIGbaE7rBx03TaxLNPRp7QVLYCh1YF5s8FfvTWs5 4HQ/HyOVPcAzLWIx4T7c7PSuwE574hTC30z5MD+gboo8ZO1swEL/2p9JfqiGYeKk0nal 5MIIwE/VHw96JJNeZqcZJEgr0zCCr/1J8UUPeTbSnHDSRHz+Ov1XXdXPt3UBy22shYth mdaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+ZfipCwxhRp6Ie3Aw8psddkQkoxd2J2YHBmheHWPB+M=; b=GwUx260o+542xO/CHw8gq3iZo50HkBHWPqNQ3CWzeBW0k/xlCRFtPIVdogVcxmdTwm B/KlVQ2z70ewcZVE6cg9jdqe5qnlX6cyWQTzXL0Cbdb7Qs7xCmLUGnsgEZ4a3ix9tUJL 4PFyAMI0RIjRveuoyB66mLRG0xWJ5I1GnaQAqL7NXADdzi2RwkDfQjztNzTzCKhokwyL lT2+9ap8a2hI1tCT9FREj3/IcpkpIIlObiMvIGwT7avF30CPh+X0tybXUbRmQjjDppi2 SOki83g4Na58rhRhKJsLs3KHTJhhV0IeGDcLTLLJVODztAHcDjWbxbHlXU9pUGWHr/Zt 46sg== X-Gm-Message-State: AOAM531EBcbWTkyq88Nm1bs332lNYuJ6a+945Y1TCli0wH0aKASnn/X7 kWDbrygX5QgmlxJibToI4+k3r2lIEbc= X-Google-Smtp-Source: ABdhPJyn837DBOaFhkhzPWGxsycV4Lg3toh+2C3DTacAM0aHhoiatj1djqfd+KoygA+AGcZDLU1nqg== X-Received: by 2002:a05:651c:54d:: with SMTP id q13mr949179ljp.526.1631211005502; Thu, 09 Sep 2021 11:10:05 -0700 (PDT) Received: from kari-VirtualBox.telewell.oy (85-23-89-224.bb.dnainternet.fi. [85.23.89.224]) by smtp.gmail.com with ESMTPSA id u2sm270276lff.238.2021.09.09.11.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 11:10:05 -0700 (PDT) From: Kari Argillander To: Konstantin Komarov , ntfs3@lists.linux.dev Cc: Kari Argillander , linux-kernel@vger.kernel.org, Christian Brauner Subject: [PATCH 10/11] fs/ntfs3: Initialize pointer before use place in fill_super Date: Thu, 9 Sep 2021 21:09:41 +0300 Message-Id: <20210909180942.8634-11-kari.argillander@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210909180942.8634-1-kari.argillander@gmail.com> References: <20210909180942.8634-1-kari.argillander@gmail.com> Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- fs/ntfs3/super.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 9a096be32fb2..321fcfce64e1 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -877,7 +877,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; @@ -906,9 +906,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.25.1