mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
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: Kari Argillander <kari.argillander@gmail.com> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
parent
b4f110d65e
commit
0cde7e81cd
@ -887,7 +887,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
|||||||
struct ATTR_DEF_ENTRY *t;
|
struct ATTR_DEF_ENTRY *t;
|
||||||
u16 *upcase;
|
u16 *upcase;
|
||||||
u16 *shared;
|
u16 *shared;
|
||||||
bool is_ro;
|
|
||||||
struct MFT_REF ref;
|
struct MFT_REF ref;
|
||||||
|
|
||||||
ref.high = 0;
|
ref.high = 0;
|
||||||
@ -1010,16 +1009,14 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
|||||||
|
|
||||||
iput(inode);
|
iput(inode);
|
||||||
|
|
||||||
is_ro = sb_rdonly(sb);
|
|
||||||
|
|
||||||
if (sbi->flags & NTFS_FLAGS_NEED_REPLAY) {
|
if (sbi->flags & NTFS_FLAGS_NEED_REPLAY) {
|
||||||
if (!is_ro) {
|
if (!sb_rdonly(sb)) {
|
||||||
ntfs_warn(sb,
|
ntfs_warn(sb,
|
||||||
"failed to replay log file. Can't mount rw!");
|
"failed to replay log file. Can't mount rw!");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
} else if (sbi->volume.flags & VOLUME_FLAG_DIRTY) {
|
} else if (sbi->volume.flags & VOLUME_FLAG_DIRTY) {
|
||||||
if (!is_ro && !sbi->options->force) {
|
if (!sb_rdonly(sb) && !sbi->options->force) {
|
||||||
ntfs_warn(
|
ntfs_warn(
|
||||||
sb,
|
sb,
|
||||||
"volume is dirty and \"force\" flag is not set!");
|
"volume is dirty and \"force\" flag is not set!");
|
||||||
|
Loading…
Reference in New Issue
Block a user