btrfs: fix for write_super_lockfs/unlockfs error handling

[linux-2.6-omap-h63xx.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b4c101d9322c8f7ae7085073b5b0f805402696fe..0a14b495532fcc901d3c3baaa29cb4753d327d7f 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -605,18 +605,20 @@ out:
        return ret;
 }
 
-static void btrfs_write_super_lockfs(struct super_block *sb)
+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 void btrfs_unlockfs(struct super_block *sb)
+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;
 }
 
 static struct super_operations btrfs_super_ops = {
@@ -631,8 +633,8 @@ static struct super_operations btrfs_super_ops = {
        .destroy_inode  = btrfs_destroy_inode,
        .statfs         = btrfs_statfs,
        .remount_fs     = btrfs_remount,
-       .write_super_lockfs = btrfs_write_super_lockfs,
-       .unlockfs       = btrfs_unlockfs,
+       .freeze_fs      = btrfs_freeze,
+       .unfreeze_fs    = btrfs_unfreeze,
 };
 
 static const struct file_operations btrfs_ctl_fops = {