Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b4c101d9322c8f7ae7085073b5b0f805402696fe..db9fb3bc1e333c5255a92537a9891d4f8716f899 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -38,6 +38,7 @@
 #include <linux/namei.h>
 #include <linux/miscdevice.h>
 #include <linux/version.h>
+#include <linux/magic.h>
 #include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"
@@ -51,7 +52,6 @@
 #include "export.h"
 #include "compression.h"
 
-#define BTRFS_SUPER_MAGIC 0x9123683E
 
 static struct super_operations btrfs_super_ops;
 
@@ -582,7 +582,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 {
        struct btrfs_ioctl_vol_args *vol;
        struct btrfs_fs_devices *fs_devices;
-       int ret = 0;
+       int ret = -ENOTTY;
        int len;
 
        if (!capable(CAP_SYS_ADMIN))
@@ -594,6 +594,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
                goto out;
        }
        len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
+
        switch (cmd) {
        case BTRFS_IOC_SCAN_DEV:
                ret = btrfs_scan_one_device(vol->name, FMODE_READ,
@@ -605,18 +606,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 +634,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 = {