diff options
Diffstat (limited to 'fs/gfs2/lm.c')
-rw-r--r-- | fs/gfs2/lm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c index f86f11f39738..3df8fa00442d 100644 --- a/fs/gfs2/lm.c +++ b/fs/gfs2/lm.c | |||
@@ -80,7 +80,8 @@ int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) | |||
80 | void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp) | 80 | void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp) |
81 | { | 81 | { |
82 | if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) | 82 | if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) |
83 | sdp->sd_lockstruct.ls_ops->lm_others_may_mount(sdp->sd_lockstruct.ls_lockspace); | 83 | sdp->sd_lockstruct.ls_ops->lm_others_may_mount( |
84 | sdp->sd_lockstruct.ls_lockspace); | ||
84 | } | 85 | } |
85 | 86 | ||
86 | void gfs2_lm_unmount(struct gfs2_sbd *sdp) | 87 | void gfs2_lm_unmount(struct gfs2_sbd *sdp) |
@@ -124,7 +125,8 @@ int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name, | |||
124 | if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) | 125 | if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) |
125 | error = -EIO; | 126 | error = -EIO; |
126 | else | 127 | else |
127 | error = sdp->sd_lockstruct.ls_ops->lm_get_lock(sdp->sd_lockstruct.ls_lockspace, name, lockp); | 128 | error = sdp->sd_lockstruct.ls_ops->lm_get_lock( |
129 | sdp->sd_lockstruct.ls_lockspace, name, lockp); | ||
128 | return error; | 130 | return error; |
129 | } | 131 | } |
130 | 132 | ||
@@ -230,6 +232,7 @@ void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid, | |||
230 | unsigned int message) | 232 | unsigned int message) |
231 | { | 233 | { |
232 | if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) | 234 | if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) |
233 | sdp->sd_lockstruct.ls_ops->lm_recovery_done(sdp->sd_lockstruct.ls_lockspace, jid, message); | 235 | sdp->sd_lockstruct.ls_ops->lm_recovery_done( |
236 | sdp->sd_lockstruct.ls_lockspace, jid, message); | ||
234 | } | 237 | } |
235 | 238 | ||