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 snap/subv deletion end more early when the fs is R/O 

The snapshot/subvolume deletion might spend lots of time, it would make
the remount task wait for a long time. This patch improve this problem,
we will break the deletion if the fs is remounted to be R/O. It will make
the users happy.

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:43 +00:00 committed by Josef Bacik
parent dc7f370c05
commit babbf170c7
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/ctree.h
View File

@ -3318,6 +3318,18 @@ static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)
smp_mb(); smp_mb();
return fs_info->closing; return fs_info->closing;
} }
/*
* 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 btrfs_need_cleaner_sleep(struct btrfs_root *root)
{
return (root->fs_info->sb->s_flags & MS_RDONLY ||
btrfs_fs_closing(root->fs_info));
}
static inline void free_fs_info(struct btrfs_fs_info *fs_info) static inline void free_fs_info(struct btrfs_fs_info *fs_info)
{ {
kfree(fs_info->balance_ctl); kfree(fs_info->balance_ctl);

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

@ -1673,17 +1673,6 @@ static void end_workqueue_fn(struct btrfs_work *work)
bio_endio(bio, error); bio_endio(bio, error);
} }
/*
* 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 ||
btrfs_fs_closing(root->fs_info));
}
static int cleaner_kthread(void *arg) static int cleaner_kthread(void *arg)
{ {
struct btrfs_root *root = arg; struct btrfs_root *root = arg;
@ -1693,7 +1682,7 @@ static int cleaner_kthread(void *arg)
again = 0; again = 0;
/* Make the cleaner go to sleep early. */ /* Make the cleaner go to sleep early. */
if (need_cleaner_sleep(root)) if (btrfs_need_cleaner_sleep(root))
goto sleep; goto sleep;
if (!mutex_trylock(&root->fs_info->cleaner_mutex)) if (!mutex_trylock(&root->fs_info->cleaner_mutex))
@ -1703,7 +1692,7 @@ static int cleaner_kthread(void *arg)
* Avoid the problem that we change the status of the fs * Avoid the problem that we change the status of the fs
* during the above check and trylock. * during the above check and trylock.
*/ */
if (need_cleaner_sleep(root)) { if (btrfs_need_cleaner_sleep(root)) {
mutex_unlock(&root->fs_info->cleaner_mutex); mutex_unlock(&root->fs_info->cleaner_mutex);
goto sleep; goto sleep;
} }

2
fs/btrfs/extent-tree.c
View File

@ -7384,7 +7384,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(root); wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(root);
while (1) { while (1) {
if (!for_reloc && btrfs_fs_closing(root->fs_info)) { if (!for_reloc && btrfs_need_cleaner_sleep(root)) {
pr_debug("btrfs: drop snapshot early exit\n"); pr_debug("btrfs: drop snapshot early exit\n");
err = -EAGAIN; err = -EAGAIN;
goto out_end_trans; goto out_end_trans;