hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs: make the cleaner complete early when the fs is going to be umounted 

Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Miao Xie 2013-05-14 10:20:41 +00:00 committed by Josef Bacik
parent d027824564
commit 05323cd135
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/disk-io.c
View File

@ -1674,12 +1674,14 @@ static void end_workqueue_fn(struct btrfs_work *work)
}
/*
* If we remount the fs to be R/O, the cleaner needn't do anything except
* sleeping. This function is used to check the status of the fs.
* If we remount the fs to be R/O or umount the fs, the cleaner needn't do
* anything except sleeping. This function is used to check the status of
* the fs.
*/
static inline int need_cleaner_sleep(struct btrfs_root *root)
{
return root->fs_info->sb->s_flags & MS_RDONLY;
return (root->fs_info->sb->s_flags & MS_RDONLY ||
btrfs_fs_closing(root->fs_info));
}
static int cleaner_kthread(void *arg)
@ -1702,8 +1704,8 @@ static int cleaner_kthread(void *arg)
mutex_unlock(&root->fs_info->cleaner_mutex);
/*
* The defragger has dealt with the R/O remount, needn't
* do anything special here.
* The defragger has dealt with the R/O remount and umount,
* needn't do anything special here.
*/
btrfs_run_defrag_inodes(root->fs_info);
sleep: