aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/stackglue.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-08-28 02:47:00 +0000
committerSteve French <sfrench@us.ibm.com>2008-08-28 02:47:00 +0000
commit6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch)
tree0659c9ae17d1375f185f88f4f7fef1a667f375d8 /fs/ocfs2/stackglue.c
parentbcc55c6664a90146149ba0fd93052adc94287b9f (diff)
parent4c246edd2550304df5b766cc841584b2bb058843 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2/stackglue.c')
-rw-r--r--fs/ocfs2/stackglue.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 10e149ae5e3..07f348b8d72 100644
--- a/fs/ocfs2/stackglue.c
+++ b/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;
}