Commit 9b54770b authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Remove duplicate check in do_xmote 



In do_xmote(), remove the duplicate check for the ->go_sync and
->go_inval glock operations.  They are either both defined, or none of
them are.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarAndrew Price <anprice@redhat.com>
parent 0c23e241

fs/gfs2/glock.c

+13 −14
Original line number Diff line number Diff line
@@ -714,11 +714,10 @@ __acquires(&gl->gl_lockref.lock) 
				     &gl->gl_flags))

			return;

	}

	if (!glops->go_inval && !glops->go_sync)

	if (!glops->go_inval || !glops->go_sync)

		goto skip_inval;



	spin_unlock(&gl->gl_lockref.lock);

	if (glops->go_sync) {

	ret = glops->go_sync(gl);

	/* If we had a problem syncing (due to io errors or whatever,

	 * we should not invalidate the metadata or tell dlm to
@@ -732,7 +731,7 @@ __acquires(&gl->gl_lockref.lock) 
		spin_lock(&gl->gl_lockref.lock);

		goto skip_inval;

	}

	}



	if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags)) {

		/*

		 * The call to go_sync should have cleared out the ail list.