From 9e57e533413f9d0d94baba964e4818d70aaf4ab7 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Fri, 11 Nov 2011 10:14:57 -0500
Subject: [PATCH] --- yaml --- r: 275330 b: refs/heads/master c:
 8965593e41dd2d0e2a2f1e6f245336005ea94a2c h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/super.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 10ef89c8c2a2..eccd458fd18b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69f4cb526bd02ae5af35846f9a710c099eec3347
+refs/heads/master: 8965593e41dd2d0e2a2f1e6f245336005ea94a2c
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 629281c65ff5..8bd9d6d0e07a 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -197,7 +197,7 @@ static match_table_t tokens = {
 	{Opt_subvolrootid, "subvolrootid=%d"},
 	{Opt_defrag, "autodefrag"},
 	{Opt_inode_cache, "inode_cache"},
-	{Opt_no_space_cache, "no_space_cache"},
+	{Opt_no_space_cache, "nospace_cache"},
 	{Opt_recovery, "recovery"},
 	{Opt_err, NULL},
 };
@@ -711,7 +711,7 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 	if (btrfs_test_opt(root, SPACE_CACHE))
 		seq_puts(seq, ",space_cache");
 	else
-		seq_puts(seq, ",no_space_cache");
+		seq_puts(seq, ",nospace_cache");
 	if (btrfs_test_opt(root, CLEAR_CACHE))
 		seq_puts(seq, ",clear_cache");
 	if (btrfs_test_opt(root, USER_SUBVOL_RM_ALLOWED))