Skip to contentSkip to conversation

Btrfs: fix how we freeze

PATCH In review Josef Bacik 2 participants 7 messages Mar 23, 2010 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs: fix how we freeze

Currently we hold the transaction mutex and the cleaner mutex when we do a freeze, but the cleaner kthread does a vfs_check_frozen() to make sure it doesn't run while the fs is frozen, so the only thing thats left is the transaction stuff. So add a vfs_check_frozen() into start_transaction and then make the freeze functions just return, since vfs_check_frozen() covers us in all the cases. This works because the vfs freezer function sync's the filesystem first, and then sets SB_FREEZE_TRANS, so no transaction started after SB_FREEZE_TRANS is set should be allowed to complete, including people calling btrfs_join_transaction. Thanks,

---
 fs/btrfs/super.c       |    6 ------
 fs/btrfs/transaction.c |    2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)
fs/btrfs/super.c +0 -6
index 9ac612e..c9ded47 100644
@@ -811,17 +811,11 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 
 static int btrfs_freeze(struct super_block *sb)
 {
-	struct btrfs_root *root = btrfs_sb(sb);
-	mutex_lock(&root->fs_info->transaction_kthread_mutex);
-	mutex_lock(&root->fs_info->cleaner_mutex);
 	return 0;
 }
 
 static int btrfs_unfreeze(struct super_block *sb)
 {
-	struct btrfs_root *root = btrfs_sb(sb);
-	mutex_unlock(&root->fs_info->cleaner_mutex);
-	mutex_unlock(&root->fs_info->transaction_kthread_mutex);
 	return 0;
 }
 
fs/btrfs/transaction.c +2 -0
index 2d654c1..c3bc9ba 100644
@@ -176,6 +176,8 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
 		kmem_cache_alloc(btrfs_trans_handle_cachep, GFP_NOFS);
 	int ret;
 
+	vfs_check_frozen(root->fs_info->sb, SB_FREEZE_TRANS);
+
 	mutex_lock(&root->fs_info->trans_mutex);
 	if (!root->fs_info->log_root_recovering &&
 	    ((type == TRANS_START && !root->fs_info->open_ioctl_trans) ||
Signature · 1 line
1.6.6.1
#1 lore raw

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

regards,
wengang.

Quoted 58 lines · Josef Bacik

Currently we hold the transaction mutex and the cleaner mutex when we do a freeze, but the cleaner kthread does a vfs_check_frozen() to make sure it doesn't run while the fs is frozen, so the only thing thats left is the transaction stuff. So add a vfs_check_frozen() into start_transaction and then make the freeze functions just return, since vfs_check_frozen() covers us in all the cases. This works because the vfs freezer function sync's the filesystem first, and then sets SB_FREEZE_TRANS, so no transaction started after SB_FREEZE_TRANS is set should be allowed to complete, including people calling btrfs_join_transaction. Thanks,

---
 fs/btrfs/super.c       |    6 ------
 fs/btrfs/transaction.c |    2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)
fs/btrfs/super.c +0 -6
index 9ac612e..c9ded47 100644
@@ -811,17 +811,11 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 
 static int btrfs_freeze(struct super_block *sb)
 {
-	struct btrfs_root *root = btrfs_sb(sb);
-	mutex_lock(&root->fs_info->transaction_kthread_mutex);
-	mutex_lock(&root->fs_info->cleaner_mutex);
 	return 0;
 }
 
 static int btrfs_unfreeze(struct super_block *sb)
 {
-	struct btrfs_root *root = btrfs_sb(sb);
-	mutex_unlock(&root->fs_info->cleaner_mutex);
-	mutex_unlock(&root->fs_info->transaction_kthread_mutex);
 	return 0;
 }
 
fs/btrfs/transaction.c +2 -0
index 2d654c1..c3bc9ba 100644
@@ -176,6 +176,8 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
 		kmem_cache_alloc(btrfs_trans_handle_cachep, GFP_NOFS);
 	int ret;
 
+	vfs_check_frozen(root->fs_info->sb, SB_FREEZE_TRANS);
+
 	mutex_lock(&root->fs_info->trans_mutex);
 	if (!root->fs_info->log_root_recovering &&
 	    ((type == TRANS_START && !root->fs_info->open_ioctl_trans) ||
Signature · 6 lines
1.6.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 5 lines · Wengang Wang

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

Because if the fs doesn't provide a freeze/unfreeze function, trying to do a freeze will return -EOPNOTSUPP, which is not what we want. Thanks,

Josef

#3 lore raw
Quoted 9 lines · Josef Bacik
Quoted 5 lines · Wengang Wang

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

Because if the fs doesn't provide a freeze/unfreeze function, trying to do a freeze will return -EOPNOTSUPP, which is not what we want. Thanks,

How does freeze_fs()/unfreeze_fs() get called in btrfs? I think they called by freeze_bdev()/unfreeze_fs() respectively. And I don't see -EOPNOTSUPP is returned in the later two functions.

regards,
wengang.

#4 lore raw
Quoted 8 lines · Wengang Wang
Quoted 7 lines · Josef Bacik
Quoted 5 lines · Wengang Wang

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

Quoted 7 lines
Quoted 2 lines

Because if the fs doesn't provide a freeze/unfreeze function, trying to do a freeze will return -EOPNOTSUPP, which is not what we want. Thanks,

How does freeze_fs()/unfreeze_fs() get called in btrfs? I think they called by freeze_bdev()/unfreeze_fs() respectively. And I don't see -EOPNOTSUPP is returned in the later two functions.

its in ioctl_fsfreeze,

        /* If filesystem doesn't support freeze feature, return. */
        if (sb->s_op->freeze_fs == NULL)
                return -EOPNOTSUPP;

Thanks,

Josef

#5 lore raw
Quoted 17 lines · Josef Bacik
Quoted 8 lines · Wengang Wang
Quoted 7 lines · Josef Bacik
Quoted 5 lines · Wengang Wang

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

Quoted 7 lines
Quoted 2 lines

Because if the fs doesn't provide a freeze/unfreeze function, trying to do a freeze will return -EOPNOTSUPP, which is not what we want. Thanks,

How does freeze_fs()/unfreeze_fs() get called in btrfs? I think they called by freeze_bdev()/unfreeze_fs() respectively. And I don't see -EOPNOTSUPP is returned in the later two functions.

Quoted 6 lines

its in ioctl_fsfreeze,

        /* If filesystem doesn't support freeze feature, return. */
        if (sb->s_op->freeze_fs == NULL)
                return -EOPNOTSUPP;

Yes, it's there.
Thanks for your explanation!

regards,
wengang.

#6 lore raw
In reply to Wengang Wang
Quoted 8 lines · Wengang Wang
Quoted 7 lines · Josef Bacik
Quoted 5 lines · Wengang Wang

Hi,

If the only thing is returning 0 in the freeze/unfreeze member functions, why not just remove the two functions?

Quoted 5 lines
Quoted 2 lines

Because if the fs doesn't provide a freeze/unfreeze function, trying to do a freeze will return -EOPNOTSUPP, which is not what we want. Thanks,

How does freeze_fs()/unfreeze_fs() get called in btrfs? I think they called by freeze_bdev()/unfreeze_fs() respectively. And I don't see

sorry, I meant called by freeze_bdev()/unfreeze_bdev() respectively.

Quoted 4 lines

-EOPNOTSUPP is returned in the later two functions.

regards,
wengang.