gfs2: Fix "ignore unlock failures after withdraw"

[ Upstream commit 5d9231111966b6c5a65016d58dcbeab91055bc91 ]

Commit 3e11e53041502 tries to suppress dlm_lock() lock conversion errors
that occur when the lockspace has already been released.

It does that by setting and checking the SDF_SKIP_DLM_UNLOCK flag.  This
conflicts with the intended meaning of the SDF_SKIP_DLM_UNLOCK flag, so
check whether the lockspace is still allocated instead.

(Given the current DLM API, checking for this kind of error after the
fact seems easier that than to make sure that the lockspace is still
allocated before calling dlm_lock().  Changing the DLM API so that users
maintain the lockspace references themselves would be an option.)

Fixes: 3e11e53041502 ("GFS2: ignore unlock failures after withdraw")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 34540f9d011ca6ca46496900fc74428f9a4f632e..385561cd4f4c739c8a4f0b9cd63618ffbaf8c0f9 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -802,11 +802,13 @@ skip_inval:
        }
 
        if (sdp->sd_lockstruct.ls_ops->lm_lock) {
+               struct lm_lockstruct *ls = &sdp->sd_lockstruct;
+
                /* lock_dlm */
                ret = sdp->sd_lockstruct.ls_ops->lm_lock(gl, target, lck_flags);
                if (ret == -EINVAL && gl->gl_target == LM_ST_UNLOCKED &&
                    target == LM_ST_UNLOCKED &&
-                   test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags)) {
+                   test_bit(DFL_UNMOUNT, &ls->ls_recover_flags)) {
                        finish_xmote(gl, target);
                        gfs2_glock_queue_work(gl, 0);
                } else if (ret) {

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index f52141ce948533607c9a2af2914df2279331269b..fc3ecb180ac5316b46442ae57ccd6810644a4f34 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -350,7 +350,6 @@ int gfs2_withdraw(struct gfs2_sbd *sdp)
                        fs_err(sdp, "telling LM to unmount\n");
                        lm->lm_unmount(sdp);
                }
-               set_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags);
                fs_err(sdp, "File system withdrawn\n");
                dump_stack();
                clear_bit(SDF_WITHDRAW_IN_PROG, &sdp->sd_flags);