diff --git a/[refs] b/[refs]
index 3276d6b3af16..a6e9bff3cbbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd30bb0af9d4671506502278e8631bed9e3c35c
+refs/heads/master: dedefd7215d3ec451291ca393e5c8e4c1882c8c6
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 40fee137dd11..5621818921f8 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -2718,9 +2718,10 @@ static int check_path_shared(struct btrfs_root *root,
 	struct extent_buffer *eb;
 	int level;
 	u64 refs = 1;
-	int uninitialized_var(ret);
 
 	for (level = 0; level < BTRFS_MAX_LEVEL; level++) {
+		int ret;
+
 		if (!path->nodes[level])
 			break;
 		eb = path->nodes[level];
@@ -2731,7 +2732,7 @@ static int check_path_shared(struct btrfs_root *root,
 		if (refs > 1)
 			return 1;
 	}
-	return ret; /* XXX callers? */
+	return 0;
 }
 
 /*