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

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

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

Subject: [Backport 0cde7e81cd44] src: Remove tmp var is_ro in

 ntfs_fill_super

We only use this in two places so we do not really need it. Also

wrapper sb_rdonly() is pretty self explanatory. This will make little

bit easier to read this super long variable list in the beginning of

ntfs_fill_super().

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, 2 insertions(+), 5 deletions(-)

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

index c18705bf857f6f58c56c619a9702fa02dc7a30b6..93b8a1f4d7483210eeac016f2fb8abaa7e5d8b2c 100644

--- a/src/super.c

+++ b/src/super.c

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

 	struct ATTR_DEF_ENTRY *t;

 	u16 *upcase;

 	u16 *shared;

-	bool is_ro;

 	struct MFT_REF ref;

 	ref.high = 0;

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

 	iput(inode);

-	is_ro = sb_rdonly(sb);

-

 	if (sbi->flags & NTFS_FLAGS_NEED_REPLAY) {

-		if (!is_ro) {

+		if (!sb_rdonly(sb)) {

 			ntfs_warn(sb,

 				  "failed to replay log file. Can't mount rw!");

 			return -EINVAL;

 		}

 	} else if (sbi->volume.flags & VOLUME_FLAG_DIRTY) {

-		if (!is_ro && !sbi->options->force) {

+		if (!sb_rdonly(sb) && !sbi->options->force) {

 			ntfs_warn(

 				sb,

 				"volume is dirty and \"force\" flag is not set!");

-- 

2.31.1