aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/stack_user.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-25 12:30:54 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-25 12:30:54 +0200
commit0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch)
tree7746534bafd57f6764bda8f26efc3929a4acf914 /fs/ocfs2/stack_user.c
parentMerge branch 'linus' into x86/kconfig (diff)
parentLinux 2.6.26-rc8 (diff)
downloadlinux-dev-0ed368c71aa65cba8d349432bd4dab4a9a2eb39c.tar.xz
linux-dev-0ed368c71aa65cba8d349432bd4dab4a9a2eb39c.zip
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'fs/ocfs2/stack_user.c')
-rw-r--r--fs/ocfs2/stack_user.c3
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:
return rc;
}
-static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn,
- int hangup_pending)
+static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn)
{
dlm_release_lockspace(conn->cc_lockspace, 2);
conn->cc_lockspace = NULL;