diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 13:17:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 13:17:33 -0700 |
| commit | 27eaf66b05687a27aaca0c0b9014c2f5c23bd18c (patch) | |
| tree | fc9c8da8cc4e6cef6d9b28970623ed7a7cd6aaf5 /fs/ocfs2/stack_user.c | |
| parent | c8988f968240069aeae16d8cf9f59096a085eb27 (diff) | |
| parent | 2c39450b39880e162b3eb339672314101f58ee1a (diff) | |
| download | blackbird-op-linux-27eaf66b05687a27aaca0c0b9014c2f5c23bd18c.tar.gz blackbird-op-linux-27eaf66b05687a27aaca0c0b9014c2f5c23bd18c.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Remove ->hangup() from stack glue operations.
ocfs2: Move the call of ocfs2_hb_ctl into the stack glue.
ocfs2: Move the hb_ctl_path sysctl into the stack glue.
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: 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; |
