git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
fs
/
ocfs2
/
stackglue.c
diff --git
a/fs/ocfs2/stackglue.c
b/fs/ocfs2/stackglue.c
index
10e149a
..
07f348b
100644
(file)
--- 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;
}