btrfs: Add nodiscard mount option.

[pandora-kernel.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 15b6a1d..e153770 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -323,7 +323,7 @@ enum {
        Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
        Opt_check_integrity, Opt_check_integrity_including_extent_data,
        Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,
-       Opt_commit_interval,
+       Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
        Opt_err,
 };
 
@@ -335,6 +335,7 @@ static match_table_t tokens = {
        {Opt_nodatasum, "nodatasum"},
        {Opt_nodatacow, "nodatacow"},
        {Opt_nobarrier, "nobarrier"},
+       {Opt_barrier, "barrier"},
        {Opt_max_inline, "max_inline=%s"},
        {Opt_alloc_start, "alloc_start=%s"},
        {Opt_thread_pool, "thread_pool=%d"},
@@ -350,12 +351,14 @@ static match_table_t tokens = {
        {Opt_flushoncommit, "flushoncommit"},
        {Opt_ratio, "metadata_ratio=%d"},
        {Opt_discard, "discard"},
+       {Opt_nodiscard, "nodiscard"},
        {Opt_space_cache, "space_cache"},
        {Opt_clear_cache, "clear_cache"},
        {Opt_user_subvol_rm_allowed, "user_subvol_rm_allowed"},
        {Opt_enospc_debug, "enospc_debug"},
        {Opt_subvolrootid, "subvolrootid=%d"},
        {Opt_defrag, "autodefrag"},
+       {Opt_nodefrag, "noautodefrag"},
        {Opt_inode_cache, "inode_cache"},
        {Opt_no_space_cache, "nospace_cache"},
        {Opt_recovery, "recovery"},
@@ -494,6 +497,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                        btrfs_clear_opt(info->mount_opt, SSD);
                        btrfs_clear_opt(info->mount_opt, SSD_SPREAD);
                        break;
+               case Opt_barrier:
+                       if (btrfs_test_opt(root, NOBARRIER))
+                               btrfs_info(root->fs_info, "turning on barriers");
+                       btrfs_clear_opt(info->mount_opt, NOBARRIER);
+                       break;
                case Opt_nobarrier:
                        btrfs_info(root->fs_info, "turning off barriers");
                        btrfs_set_opt(info->mount_opt, NOBARRIER);
@@ -568,6 +576,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                case Opt_discard:
                        btrfs_set_opt(info->mount_opt, DISCARD);
                        break;
+               case Opt_nodiscard:
+                       btrfs_clear_opt(info->mount_opt, DISCARD);
+                       break;
                case Opt_space_cache:
                        btrfs_set_opt(info->mount_opt, SPACE_CACHE);
                        break;
@@ -596,6 +607,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
                        btrfs_info(root->fs_info, "enabling auto defrag");
                        btrfs_set_opt(info->mount_opt, AUTO_DEFRAG);
                        break;
+               case Opt_nodefrag:
+                       if (btrfs_test_opt(root, AUTO_DEFRAG))
+                               btrfs_info(root->fs_info, "disabling auto defrag");
+                       btrfs_clear_opt(info->mount_opt, AUTO_DEFRAG);
+                       break;
                case Opt_recovery:
                        btrfs_info(root->fs_info, "enabling auto recovery");
                        btrfs_set_opt(info->mount_opt, RECOVERY);