diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:37:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:37:31 +0200 |
commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /fs/ocfs2/stack_user.c | |
parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) |
Merge branch 'linus' into sched/urgent
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 6b97d11f6bf..c021280dd46 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; |