From 7467d0090466d3666518c091c7d9b311a8542e82 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 22 Jun 2012 12:13:01 -0600
Subject: [PATCH] --- yaml --- r: 318839 b: refs/heads/master c:
 fed425c742cb1262ce90a41f2d3d211bac099533 h: refs/heads/master i:   318837:
 32b94182bd50bfd0ef65c01b4d2b62d2c510e7c1   318835:
 8655a8cbf390e3222260dfcaec9610539c70bd74   318831:
 1e8ba6f22a58508b4ae240327d0e873cde994a24 v: v3

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

diff --git a/[refs] b/[refs]
index f4bbb4c1dfb3..83fce51bdb9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02db0844beffc1c4e99d750be58ffb3ed95d6d62
+refs/heads/master: fed425c742cb1262ce90a41f2d3d211bac099533
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 2936ca49b3b4..fd216d9369fa 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -2244,7 +2244,7 @@ int open_ctree(struct super_block *sb,
 	ret |= btrfs_start_workers(&fs_info->caching_workers);
 	ret |= btrfs_start_workers(&fs_info->readahead_workers);
 	if (ret) {
-		ret = -ENOMEM;
+		err = -ENOMEM;
 		goto fail_sb_buffer;
 	}