From owner-svn-src-projects@FreeBSD.ORG  Sat Aug  7 02:07:41 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 44F5B106566C;
	Sat,  7 Aug 2010 02:07:41 +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 343DE8FC0C;
	Sat,  7 Aug 2010 02:07:41 +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 o7727fPW099015;
	Sat, 7 Aug 2010 02:07:41 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7727fYu099013;
	Sat, 7 Aug 2010 02:07:41 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008070207.o7727fYu099013@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Sat, 7 Aug 2010 02:07:41 +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: r210987 - 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: Sat, 07 Aug 2010 02:07:41 -0000

Author: jeff
Date: Sat Aug  7 02:07:40 2010
New Revision: 210987
URL: http://svn.freebsd.org/changeset/base/210987

Log:
   - Don't call taskqueue_cancel if the queue hasn't been assigned.
  
  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	Sat Aug  7 01:49:44 2010	(r210986)
+++ projects/ofed/head/sys/ofed/include/linux/workqueue.h	Sat Aug  7 02:07:40 2010	(r210987)
@@ -166,7 +166,8 @@ flush_taskqueue(struct taskqueue *tq)
 }
 
 #define	cancel_work_sync(work)						\
-	taskqueue_cancel((work)->taskqueue, &(work)->work_task)
+	(work)->taskqueue ?						\
+	taskqueue_cancel((work)->taskqueue, &(work)->work_task) : 0
 
 static inline int
 cancel_delayed_work(struct delayed_work *work)
@@ -174,7 +175,7 @@ cancel_delayed_work(struct delayed_work 
 	int error;
 
 	error = callout_drain(&work->timer);
-	if (error == 0)
+	if (error == 0 && work->work.taskqueue)
 		error = taskqueue_cancel(work->work.taskqueue,
 		    &work->work.work_task);
 	return error;