From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 29 04:16:12 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 851B91065672;
	Wed, 29 Dec 2010 04:16:12 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 747CB8FC15;
	Wed, 29 Dec 2010 04:16:12 +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 oBT4GCkO086923;
	Wed, 29 Dec 2010 04:16:12 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBT4GCY1086921;
	Wed, 29 Dec 2010 04:16:12 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201012290416.oBT4GCY1086921@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Wed, 29 Dec 2010 04:16:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216788 - projects/ofed/head/sys/ofed/include/linux
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Dec 2010 04:16:12 -0000

Author: jeff
Date: Wed Dec 29 04:16:12 2010
New Revision: 216788
URL: http://svn.freebsd.org/changeset/base/216788

Log:
   - cancel_delayed_work() is not expected to be perfect and may be called
     with locks held.  Use the non-blocking callout_stop() and a non-blocking
     workqueue_cancel().
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/workqueue.h

Modified: projects/ofed/head/sys/ofed/include/linux/workqueue.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/workqueue.h	Wed Dec 29 04:14:24 2010	(r216787)
+++ projects/ofed/head/sys/ofed/include/linux/workqueue.h	Wed Dec 29 04:16:12 2010	(r216788)
@@ -167,17 +167,20 @@ flush_taskqueue(struct taskqueue *tq)
 
 #define	cancel_work_sync(work)						\
 	(work)->taskqueue ?						\
-	taskqueue_cancel((work)->taskqueue, &(work)->work_task) : 0
+	taskqueue_cancel((work)->taskqueue, &(work)->work_task, 1) : 0
 
+/*
+ * This may leave work running on another CPU as it does on Linux.
+ */
 static inline int
 cancel_delayed_work(struct delayed_work *work)
 {
 	int error;
 
-	error = callout_drain(&work->timer);
-	if (error == 0 && work->work.taskqueue)
+	callout_stop(&work->timer);
+	if (work->work.taskqueue)
 		error = taskqueue_cancel(work->work.taskqueue,
-		    &work->work.work_task);
+		    &work->work.work_task, 0);
 	return error;
 }