UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs/ntfs3: ntfs3_forced_shutdown use int instead of bool 

[ Upstream commit 97ec56d390a3a0077b36cb38627f671c72dddce6 ]

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Konstantin Komarov 2023-11-24 12:21:12 +03:00 committed by Greg Kroah-Hartman
parent f73f939792
commit 323b0ab3f2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ntfs3/fsntfs.c
View File

@ -853,7 +853,8 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)
/*
* sb can be NULL here. In this case sbi->flags should be 0 too.
*/
if (!sb || !(sbi->flags & NTFS_FLAGS_MFTMIRR))
if (!sb || !(sbi->flags & NTFS_FLAGS_MFTMIRR) ||
unlikely(ntfs3_forced_shutdown(sb)))
return;
blocksize = sb->s_blocksize;

6
fs/ntfs3/ntfs_fs.h
View File

@ -62,7 +62,7 @@ enum utf16_endian;
/* sbi->flags */
#define NTFS_FLAGS_NODISCARD 0x00000001
/* ntfs in shutdown state. */
#define NTFS_FLAGS_SHUTDOWN 0x00000002
#define NTFS_FLAGS_SHUTDOWN_BIT 0x00000002 /* == 4*/
/* Set when LogFile is replaying. */
#define NTFS_FLAGS_LOG_REPLAYING 0x00000008
/* Set when we changed first MFT's which copy must be updated in $MftMirr. */
@ -1001,9 +1001,9 @@ static inline struct ntfs_sb_info *ntfs_sb(struct super_block *sb)
return sb->s_fs_info;
}
static inline bool ntfs3_forced_shutdown(struct super_block *sb)
static inline int ntfs3_forced_shutdown(struct super_block *sb)
{
return test_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flags);
return test_bit(NTFS_FLAGS_SHUTDOWN_BIT, &ntfs_sb(sb)->flags);
}
/*

2
fs/ntfs3/super.c
View File

@ -719,7 +719,7 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)
*/
static void ntfs_shutdown(struct super_block *sb)
{
set_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flags);
set_bit(NTFS_FLAGS_SHUTDOWN_BIT, &ntfs_sb(sb)->flags);
}
/*