2 files changed, 25 insertions, 5 deletions

diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
new file mode 100644
index 000000000000..f8fcf999ea1b
--- /dev/null
+++ b/fs/btrfs/Kconfig
@@ -0,0 +1,18 @@
+config BTRFS_FS
+        tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+        depends on EXPERIMENTAL
+        select LIBCRC32C
+        select ZLIB_INFLATE
+        select ZLIB_DEFLATE
+        help
+          Btrfs is a new filesystem with extents, writable snapshotting,
+          support for multiple devices and many more features.
+
+          Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
+          FINALIZED.  You should say N here unless you are interested in
+          testing Btrfs with non-critical data.
+
+          To compile this file system support as a module, choose M here. The
+          module will be called btrfs.
+
+          If unsure, say N.
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4c0b7569ba52..f3fd7e2cbc38 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -37,6 +37,7 @@
 #include <linux/ctype.h>
 #include <linux/namei.h>
 #include <linux/miscdevice.h>
+#include <linux/magic.h>
 #include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"
@@ -50,7 +51,6 @@
 #include "export.h"
 #include "compression.h"
 
-#define BTRFS_SUPER_MAGIC 0x9123683E
 
 static struct super_operations btrfs_super_ops;
 
@@ -606,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 = {
@@ -632,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 = {