diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
| commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
| tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /fs/ocfs2/stack_user.c | |
| parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'fs/ocfs2/stack_user.c')
| -rw-r--r-- | fs/ocfs2/stack_user.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 6b97d11f6bf8..c021280dd462 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
| @@ -816,8 +816,7 @@ out: | |||
| 816 | return rc; | 816 | return rc; |
| 817 | } | 817 | } |
| 818 | 818 | ||
| 819 | static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn, | 819 | static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn) |
| 820 | int hangup_pending) | ||
| 821 | { | 820 | { |
| 822 | dlm_release_lockspace(conn->cc_lockspace, 2); | 821 | dlm_release_lockspace(conn->cc_lockspace, 2); |
| 823 | conn->cc_lockspace = NULL; | 822 | conn->cc_lockspace = NULL; |