diff --git a/[refs] b/[refs]
index f3373412d709..0dcaa8a4ed2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de6bf18e9ce0df807dab08cff08751cac383429d
+refs/heads/master: d6817cdbd143f87f9d7c59a4c3194091190eeb84
diff --git a/trunk/fs/ocfs2/stackglue.c b/trunk/fs/ocfs2/stackglue.c
index 10e149ae5e3a..07f348b8d721 100644
--- a/trunk/fs/ocfs2/stackglue.c
+++ b/trunk/fs/ocfs2/stackglue.c
@@ -97,13 +97,14 @@ static int ocfs2_stack_driver_request(const char *stack_name,
 		goto out;
 	}
 
-	/* Ok, the stack is pinned */
-	p->sp_count++;
 	active_stack = p;
-
 	rc = 0;
 
 out:
+	/* If we found it, pin it */
+	if (!rc)
+		active_stack->sp_count++;
+
 	spin_unlock(&ocfs2_stack_lock);
 	return rc;
 }