From b4f110d65e21bf937fc5d3d894ec1cd540c85a71 Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport b4f110d65e21] src: Use sb instead of sbi->sb in

 fill_super

Use sb instead of sbi->sb in fill_super. We have sb so why not use

it. Also makes code more readable.

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

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

---

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

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

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

index 4ff61534682cd903bcea5f8c73567f10006e3a4d..c18705bf857f6f58c56c619a9702fa02dc7a30b6 100644

--- a/src/super.c

+++ b/src/super.c

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

 	iput(inode);

-	is_ro = sb_rdonly(sbi->sb);

+	is_ro = sb_rdonly(sb);

 	if (sbi->flags & NTFS_FLAGS_NEED_REPLAY) {

 		if (!is_ro) {

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

 	/* Not necessary. */

 	sbi->used.bitmap.set_tail = true;

-	err = wnd_init(&sbi->used.bitmap, sbi->sb, tt);

+	err = wnd_init(&sbi->used.bitmap, sb, tt);

 	if (err)

 		goto out;

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

 	/* Load $AttrDef. */

 	ref.low = cpu_to_le32(MFT_REC_ATTR);

 	ref.seq = cpu_to_le16(MFT_REC_ATTR);

-	inode = ntfs_iget5(sbi->sb, &ref, &NAME_ATTRDEF);

+	inode = ntfs_iget5(sb, &ref, &NAME_ATTRDEF);

 	if (IS_ERR(inode)) {

 		ntfs_err(sb, "Failed to load $AttrDef -> %d", err);

 		return PTR_ERR(inode);

-- 

2.31.1