Skip to content

Commit

Permalink
btrfs: fix for write_super_lockfs/unlockfs error handling
Browse files Browse the repository at this point in the history
Commit c4be0c1 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>
  • Loading branch information
Linus Torvalds committed Jan 10, 2009
1 parent f4b477c commit 0176260
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions fs/btrfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,18 +605,20 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
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 = {
Expand All @@ -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 = {
Expand Down

0 comments on commit 0176260

Please sign in to comment.