Btrfs: properly update block accounting for metadata

[linux-2.6-omap-h63xx.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 77c5eff3e209d8098b942006cf81ed9cdf7eecbc..84c3b66564d0f16a34712fc4c0803771904ac362 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -37,6 +37,8 @@
 #include <linux/ctype.h>
 #include <linux/namei.h>
 #include <linux/miscdevice.h>
+#include <linux/version.h>
+#include "compat.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -56,14 +58,15 @@ static struct super_operations btrfs_super_ops;
 static void btrfs_put_super (struct super_block * sb)
 {
        struct btrfs_root *root = btrfs_sb(sb);
-       struct btrfs_fs_info *fs = root->fs_info;
        int ret;
 
        ret = close_ctree(root);
        if (ret) {
                printk("close ctree returns %d\n", ret);
        }
-       btrfs_sysfs_del_super(fs);
+#if 0
+       btrfs_sysfs_del_super(root->fs_info);
+#endif
        sb->s_fs_info = NULL;
 }
 
@@ -240,7 +243,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
  * All other options will be parsed on much later in the mount process and
  * only when we need to allocate a new super block.
  */
-static int btrfs_parse_early_options(const char *options, int flags,
+static int btrfs_parse_early_options(const char *options, fmode_t flags,
                void *holder, char **subvol_name,
                struct btrfs_fs_devices **fs_devices)
 {
@@ -347,11 +350,12 @@ static int btrfs_fill_super(struct super_block * sb,
                err = -ENOMEM;
                goto fail_close;
        }
-
+#if 0
        /* this does the super kobj at the same time */
        err = btrfs_sysfs_add_super(tree_root->fs_info);
        if (err)
                goto fail_close;
+#endif
 
        sb->s_root = root_dentry;
 
@@ -416,18 +420,22 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
        struct super_block *s;
        struct dentry *root;
        struct btrfs_fs_devices *fs_devices = NULL;
+       fmode_t mode = FMODE_READ;
        int error = 0;
 
-       error = btrfs_parse_early_options(data, flags, fs_type,
+       if (!(flags & MS_RDONLY))
+               mode |= FMODE_WRITE;
+
+       error = btrfs_parse_early_options(data, mode, fs_type,
                                          &subvol_name, &fs_devices);
        if (error)
                goto error;
 
-       error = btrfs_scan_one_device(dev_name, flags, fs_type, &fs_devices);
+       error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices);
        if (error)
                goto error_free_subvol_name;
 
-       error = btrfs_open_devices(fs_devices, flags, fs_type);
+       error = btrfs_open_devices(fs_devices, mode, fs_type);
        if (error)
                goto error_free_subvol_name;
 
@@ -589,7 +597,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
        len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
        switch (cmd) {
        case BTRFS_IOC_SCAN_DEV:
-               ret = btrfs_scan_one_device(vol->name, MS_RDONLY,
+               ret = btrfs_scan_one_device(vol->name, FMODE_READ,
                                            &btrfs_fs_type, &fs_devices);
                break;
        }
@@ -645,7 +653,7 @@ static int btrfs_interface_init(void)
        return misc_register(&btrfs_misc);
 }
 
-void btrfs_interface_exit(void)
+static void btrfs_interface_exit(void)
 {
        if (misc_deregister(&btrfs_misc) < 0)
                printk("misc_deregister failed for control device");