diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2008-05-23 15:46:04 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-06-27 10:39:28 +0200 |
| commit | 048bca223739368aa5b9ce7cfb1d576c32d66cc7 (patch) | |
| tree | 66d4f1c0e90eb6429755cb4529f8c7f609026e89 /fs/gfs2/recovery.c | |
| parent | [GFS2] Fix ordering bug in lock_dlm (diff) | |
| download | linux-048bca223739368aa5b9ce7cfb1d576c32d66cc7.tar.xz linux-048bca223739368aa5b9ce7cfb1d576c32d66cc7.zip | |
[GFS2] No lock_nolock
This patch merges the lock_nolock module into GFS2 itself. As well as removing
some of the overhead of the module, it also means that its now impossible to
build GFS2 without a lock module (which would be a pointless thing to do
anyway).
We also plan to merge lock_dlm into GFS2 in the future, but that is a more
tricky task, and will therefore be a separate patch.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/gfs2/recovery.c')
| -rw-r--r-- | fs/gfs2/recovery.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c index fdd3f0f16d0d..d5e91f4f6a0b 100644 --- a/fs/gfs2/recovery.c +++ b/fs/gfs2/recovery.c @@ -428,6 +428,9 @@ static int clean_journal(struct gfs2_jdesc *jd, struct gfs2_log_header_host *hea static void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid, unsigned int message) { + if (!sdp->sd_lockstruct.ls_ops->lm_recovery_done) + return; + if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) sdp->sd_lockstruct.ls_ops->lm_recovery_done( sdp->sd_lockstruct.ls_lockspace, jid, message); |