From owner-svn-src-all@FreeBSD.ORG  Fri Oct 22 22:54:26 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6ABF106566B;
	Fri, 22 Oct 2010 22:54:26 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 95AC78FC08;
	Fri, 22 Oct 2010 22:54:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9MMsQ9n068660;
	Fri, 22 Oct 2010 22:54:26 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9MMsQkl068658;
	Fri, 22 Oct 2010 22:54:26 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201010222254.o9MMsQkl068658@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 22 Oct 2010 22:54:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214228 - head/sys/geom/eli
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Oct 2010 22:54:26 -0000

Author: pjd
Date: Fri Oct 22 22:54:26 2010
New Revision: 214228
URL: http://svn.freebsd.org/changeset/base/214228

Log:
  Close a race between checking if device is already suspended and suspending it.

Modified:
  head/sys/geom/eli/g_eli_ctl.c

Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c	Fri Oct 22 22:45:26 2010	(r214227)
+++ head/sys/geom/eli/g_eli_ctl.c	Fri Oct 22 22:54:26 2010	(r214228)
@@ -840,10 +840,6 @@ g_eli_ctl_resume(struct gctl_req *req, s
 		gctl_error(req, "Provider %s is invalid.", name);
 		return;
 	}
-	if (!(sc->sc_flags & G_ELI_FLAG_SUSPEND)) {
-		gctl_error(req, "Provider %s not suspended.", name);
-		return;
-	}
 	cp = LIST_FIRST(&sc->sc_geom->consumer);
 	pp = cp->provider;
 	error = g_eli_read_metadata(mp, pp, &md);
@@ -880,14 +876,18 @@ g_eli_ctl_resume(struct gctl_req *req, s
 	G_ELI_DEBUG(1, "Using Master Key %u for %s.", nkey, pp->name);
 
 	mtx_lock(&sc->sc_queue_mtx);
-	/* Restore sc_mkey, sc_ekeys, sc_akey and sc_ivkey. */
-	g_eli_mkey_propagate(sc, mkey);
-	sc->sc_flags &= ~G_ELI_FLAG_SUSPEND;
+	if (!(sc->sc_flags & G_ELI_FLAG_SUSPEND))
+		gctl_error(req, "Device %s is not suspended.", name);
+	else {
+		/* Restore sc_mkey, sc_ekeys, sc_akey and sc_ivkey. */
+		g_eli_mkey_propagate(sc, mkey);
+		sc->sc_flags &= ~G_ELI_FLAG_SUSPEND;
+		G_ELI_DEBUG(1, "Resumed %s.", pp->name);
+		wakeup(sc);
+	}
 	mtx_unlock(&sc->sc_queue_mtx);
 	bzero(mkey, sizeof(mkey));
 	bzero(&md, sizeof(md));
-	G_ELI_DEBUG(1, "Resumed %s.", pp->name);
-	wakeup(sc);
 }
 
 static int