Commit e402746a authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Wait for unlock completion on umount 



This patch adds a wait on umount between the point at which we
dispose of all glocks and the point at which we unmount the
lock protocol. This ensures that we've received all the replies
to our unlock requests before we stop the locking.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Reported-by: default avatarFabio M. Di Nitto <fdinitto@redhat.com>
parent 1a45dcfe

fs/gfs2/incore.h

+2 −0
Original line number Diff line number Diff line
@@ -544,6 +544,8 @@ struct gfs2_sbd { 
	struct gfs2_holder sd_live_gh;

	struct gfs2_glock *sd_rename_gl;

	struct gfs2_glock *sd_trans_gl;

	wait_queue_head_t sd_glock_wait;

	atomic_t sd_glock_disposal;



	/* Inode Stuff */

fs/gfs2/lock_dlm.c

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ static void gdlm_ast(void *arg) 
{

	struct gfs2_glock *gl = arg;

	unsigned ret = gl->gl_state;

	struct gfs2_sbd *sdp = gl->gl_sbd;



	BUG_ON(gl->gl_lksb.sb_flags & DLM_SBF_DEMOTED);
@@ -30,6 +31,8 @@ static void gdlm_ast(void *arg) 
	switch (gl->gl_lksb.sb_status) {

	case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */

		kmem_cache_free(gfs2_glock_cachep, gl);

		if (atomic_dec_and_test(&sdp->sd_glock_disposal))

			wake_up(&sdp->sd_glock_wait);

		return;

	case -DLM_ECANCEL: /* Cancel while getting lock */

		ret |= LM_OUT_CANCELED;
@@ -167,7 +170,8 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl, 
static void gdlm_put_lock(struct kmem_cache *cachep, void *ptr)

{

	struct gfs2_glock *gl = ptr;

	struct lm_lockstruct *ls = &gl->gl_sbd->sd_lockstruct;

	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct lm_lockstruct *ls = &sdp->sd_lockstruct;

	int error;



	if (gl->gl_lksb.sb_lkid == 0) {
@@ -183,6 +187,7 @@ static void gdlm_put_lock(struct kmem_cache *cachep, void *ptr) 
		       (unsigned long long)gl->gl_name.ln_number, error);

		return;

	}

	atomic_inc(&sdp->sd_glock_disposal);

}



static void gdlm_cancel(struct gfs2_glock *gl)

fs/gfs2/ops_fstype.c

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) 


	gfs2_tune_init(&sdp->sd_tune);



	init_waitqueue_head(&sdp->sd_glock_wait);

	atomic_set(&sdp->sd_glock_disposal, 0);

	spin_lock_init(&sdp->sd_statfs_spin);



	spin_lock_init(&sdp->sd_rindex_spin);

fs/gfs2/super.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/gfs2_ondisk.h>

#include <linux/crc32.h>

#include <linux/time.h>

#include <linux/wait.h>



#include "gfs2.h"

#include "incore.h"
@@ -860,6 +861,8 @@ restart: 
	gfs2_jindex_free(sdp);

	/*  Take apart glock structures and buffer lists  */

	gfs2_gl_hash_clear(sdp);

	/* Wait for dlm to reply to all our unlock requests */

	wait_event(sdp->sd_glock_wait, atomic_read(&sdp->sd_glock_disposal) == 0);

	/*  Unmount the locking protocol  */

	gfs2_lm_unmount(sdp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE