summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-10 06:09:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-10 06:09:52 -0800
commit0176260fc30842e358cf34afa7dcd9413db44822 (patch)
treec41a99cfbfc904740f81b7b948a05d259ad3aec4
parentf4b477c47332367d35686bd2b808c2156b96d7c7 (diff)
downloadconfigs-0176260fc30842e358cf34afa7dcd9413db44822.tar.gz
btrfs: fix for write_super_lockfs/unlockfs error handling
Commit c4be0c1dc4cdc37b175579be1460f15ac6495e9a added the ability for write_super_lockfs to return errors, and renamed them to match. But btrfs didn't get converted. Do the minimal conversion to make it compile again. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/btrfs/super.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b4c101d9322..0a14b495532 100644
--- 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 = {