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/gfs2 | |
| parent | 757a42719635495779462514458bbfbf12a37dac (diff) | |
| download | blackbird-op-linux-60f98d1839376d30e13f3e452dce2433fad3060e.tar.gz blackbird-op-linux-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/gfs2')
| -rw-r--r-- | fs/gfs2/lock_dlm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 98c80d8c2a62..ce85b62bc0a2 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c @@ -195,10 +195,10 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *fsname) return -EINVAL; } - error = dlm_new_lockspace(fsname, strlen(fsname), &ls->ls_dlm, + error = dlm_new_lockspace(fsname, NULL, DLM_LSFL_FS | DLM_LSFL_NEWEXCL | (ls->ls_nodir ? DLM_LSFL_NODIR : 0), - GDLM_LVB_SIZE); + GDLM_LVB_SIZE, NULL, NULL, NULL, &ls->ls_dlm); if (error) printk(KERN_ERR "dlm_new_lockspace error %d", error); |
