diff options
author | David Teigland <teigland@redhat.com> | 2011-11-02 14:30:58 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2012-01-04 08:56:31 -0600 |
commit | 60f98d1839376d30e13f3e452dce2433fad3060e (patch) | |
tree | b8b43859ad26519bd75a40920f6d1ca46f2d44a5 /fs/ocfs2 | |
parent | 757a42719635495779462514458bbfbf12a37dac (diff) | |
download | linux-stable-60f98d1839376d30e13f3e452dce2433fad3060e.tar.gz linux-stable-60f98d1839376d30e13f3e452dce2433fad3060e.tar.bz2 linux-stable-60f98d1839376d30e13f3e452dce2433fad3060e.zip |
dlm: add recovery callbacks
These new callbacks notify the dlm user about lock recovery.
GFS2, and possibly others, need to be aware of when the dlm
will be doing lock recovery for a failed lockspace member.
In the past, this coordination has been done between dlm and
file system daemons in userspace, which then direct their
kernel counterparts. These callbacks allow the same
coordination directly, and more simply.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/stack_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index a5ebe421195f..286edf1e231f 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c @@ -827,8 +827,8 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) goto out; } - rc = dlm_new_lockspace(conn->cc_name, strlen(conn->cc_name), - &fsdlm, DLM_LSFL_FS, DLM_LVB_LEN); + rc = dlm_new_lockspace(conn->cc_name, NULL, DLM_LSFL_FS, DLM_LVB_LEN, + NULL, NULL, NULL, &fsdlm); if (rc) { ocfs2_live_connection_drop(control); goto out; |