Unverified Commit 97ec56d3 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: ntfs3_forced_shutdown use int instead of bool 



Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 6c3684e7

fs/ntfs3/fsntfs.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

fs/ntfs3/ntfs_fs.h

+3 −3
Original line number Diff line number Diff line
@@ -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);

}



/*

fs/ntfs3/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/*