Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e11e530 authored Mar 23, 2016 by Benjamin Marzinski Committed by Bob Peterson Mar 24, 2016

GFS2: ignore unlock failures after withdraw



After gfs2 has withdrawn the filesystem, it may still have many locks not
in the unlocked state.  If it is using lock_dlm, it will failed trying
the unlocks since it has already unmounted the lock manager. Instead, it
should set the SDF_SKIP_DLM_UNLOCK flag on withdraw, to signal that
it can skip the lock_manager on unlocks, and failback to lock_nolock
style unlocking.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

parent 9dffdb38

fs/gfs2/glock.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -475,7 +475,14 @@ __acquires(&gl->gl_lockref.lock)
		if (sdp->sd_lockstruct.ls_ops->lm_lock) {
		/* lock_dlm */
		ret = sdp->sd_lockstruct.ls_ops->lm_lock(gl, target, lck_flags);
		if (ret) {
		if (ret == -EINVAL && gl->gl_target == LM_ST_UNLOCKED &&
		target == LM_ST_UNLOCKED &&
		test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags)) {
		finish_xmote(gl, target);
		if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
		gfs2_glock_put(gl);
		}
		else if (ret) {
		pr_err("lm_lock ret %d\n", ret);
		GLOCK_BUG_ON(gl, 1);
		}

fs/gfs2/util.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd sdp, const char fmt, ...)
		fs_err(sdp, "telling LM to unmount\n");
		lm->lm_unmount(sdp);
		}
		set_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags);
		fs_err(sdp, "withdrawn\n");
		dump_stack();
		}