diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-10 09:09:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-10 09:09:52 -0500 |
| commit | 0176260fc30842e358cf34afa7dcd9413db44822 (patch) | |
| tree | c41a99cfbfc904740f81b7b948a05d259ad3aec4 | |
| parent | f4b477c47332367d35686bd2b808c2156b96d7c7 (diff) | |
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.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index b4c101d9322c..0a14b495532f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -605,18 +605,20 @@ out: | |||
| 605 | return ret; | 605 | return ret; |
| 606 | } | 606 | } |
| 607 | 607 | ||
| 608 | static void btrfs_write_super_lockfs(struct super_block *sb) | 608 | static int btrfs_freeze(struct super_block *sb) |
| 609 | { | 609 | { |
| 610 | struct btrfs_root *root = btrfs_sb(sb); | 610 | struct btrfs_root *root = btrfs_sb(sb); |
| 611 | mutex_lock(&root->fs_info->transaction_kthread_mutex); | 611 | mutex_lock(&root->fs_info->transaction_kthread_mutex); |
| 612 | mutex_lock(&root->fs_info->cleaner_mutex); | 612 | mutex_lock(&root->fs_info->cleaner_mutex); |
| 613 | return 0; | ||
| 613 | } | 614 | } |
| 614 | 615 | ||
| 615 | static void btrfs_unlockfs(struct super_block *sb) | 616 | static int btrfs_unfreeze(struct super_block *sb) |
| 616 | { | 617 | { |
| 617 | struct btrfs_root *root = btrfs_sb(sb); | 618 | struct btrfs_root *root = btrfs_sb(sb); |
| 618 | mutex_unlock(&root->fs_info->cleaner_mutex); | 619 | mutex_unlock(&root->fs_info->cleaner_mutex); |
| 619 | mutex_unlock(&root->fs_info->transaction_kthread_mutex); | 620 | mutex_unlock(&root->fs_info->transaction_kthread_mutex); |
| 621 | return 0; | ||
| 620 | } | 622 | } |
| 621 | 623 | ||
| 622 | static struct super_operations btrfs_super_ops = { | 624 | static struct super_operations btrfs_super_ops = { |
| @@ -631,8 +633,8 @@ static struct super_operations btrfs_super_ops = { | |||
| 631 | .destroy_inode = btrfs_destroy_inode, | 633 | .destroy_inode = btrfs_destroy_inode, |
| 632 | .statfs = btrfs_statfs, | 634 | .statfs = btrfs_statfs, |
| 633 | .remount_fs = btrfs_remount, | 635 | .remount_fs = btrfs_remount, |
| 634 | .write_super_lockfs = btrfs_write_super_lockfs, | 636 | .freeze_fs = btrfs_freeze, |
| 635 | .unlockfs = btrfs_unlockfs, | 637 | .unfreeze_fs = btrfs_unfreeze, |
| 636 | }; | 638 | }; |
| 637 | 639 | ||
| 638 | static const struct file_operations btrfs_ctl_fops = { | 640 | static const struct file_operations btrfs_ctl_fops = { |
