Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / fs / gfs2 / lock_dlm.c

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 59ab18c798890f9c8af9fdd98938354e7473ee47..d1ac5d0679ea6a4ac989e2eb192d5503ab6df9f5 100644 (file)
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -1122,7 +1122,7 @@ static void gdlm_recover_prep(void *arg)
        struct gfs2_sbd *sdp = arg;
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawn(sdp)) {
+       if (gfs2_withdrawing_or_withdrawn(sdp)) {
                fs_err(sdp, "recover_prep ignored due to withdraw.\n");
                return;
        }
@@ -1148,7 +1148,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot)
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
        int jid = slot->slot - 1;
 
-       if (gfs2_withdrawn(sdp)) {
+       if (gfs2_withdrawing_or_withdrawn(sdp)) {
                fs_err(sdp, "recover_slot jid %d ignored due to withdraw.\n",
                       jid);
                return;
@@ -1177,7 +1177,7 @@ static void gdlm_recover_done(void *arg, struct dlm_slot *slots, int num_slots,
        struct gfs2_sbd *sdp = arg;
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawn(sdp)) {
+       if (gfs2_withdrawing_or_withdrawn(sdp)) {
                fs_err(sdp, "recover_done ignored due to withdraw.\n");
                return;
        }
@@ -1208,7 +1208,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid,
 {
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (gfs2_withdrawn(sdp)) {
+       if (gfs2_withdrawing_or_withdrawn(sdp)) {
                fs_err(sdp, "recovery_result jid %d ignored due to withdraw.\n",
                       jid);
                return;