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

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

fs/ntfs3/super.c

+2 −5
Original line number Diff line number Diff line
@@ -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!");