diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:11:18 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:11:18 -0500 |
| commit | a4ad68d57e4dc4138304df23d1817eb094149389 (patch) | |
| tree | ca7d8c4ce5377c4251560de06e15dd7be7063351 /fs/ocfs2/stack_user.c | |
| parent | cd9d95a55550555da8e587ead9cbba5f98a371a3 (diff) | |
| parent | c97259df3f2e163c72f4d0685c61fb2e026dc989 (diff) | |
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
Diffstat (limited to 'fs/ocfs2/stack_user.c')
| -rw-r--r-- | fs/ocfs2/stack_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index ff4c798a5635..da78a2a334fd 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
| @@ -814,7 +814,7 @@ static int fs_protocol_compare(struct ocfs2_protocol_version *existing, | |||
| 814 | static int user_cluster_connect(struct ocfs2_cluster_connection *conn) | 814 | static int user_cluster_connect(struct ocfs2_cluster_connection *conn) |
| 815 | { | 815 | { |
| 816 | dlm_lockspace_t *fsdlm; | 816 | dlm_lockspace_t *fsdlm; |
| 817 | struct ocfs2_live_connection *control; | 817 | struct ocfs2_live_connection *uninitialized_var(control); |
| 818 | int rc = 0; | 818 | int rc = 0; |
| 819 | 819 | ||
| 820 | BUG_ON(conn == NULL); | 820 | BUG_ON(conn == NULL); |