From owner-p4-projects@FreeBSD.ORG  Mon Jun 13 15:33:43 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E9A3106567B; Mon, 13 Jun 2011 15:33:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 013701065673
	for <perforce@FreeBSD.org>; Mon, 13 Jun 2011 15:33:43 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E41EB8FC16
	for <perforce@FreeBSD.org>; Mon, 13 Jun 2011 15:33:42 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5DFXglM074429
	for <perforce@FreeBSD.org>; Mon, 13 Jun 2011 15:33:42 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5DFXgbW074426
	for perforce@freebsd.org; Mon, 13 Jun 2011 15:33:42 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Mon, 13 Jun 2011 15:33:42 GMT
Message-Id: <201106131533.p5DFXgbW074426@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 194681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2011 15:33:43 -0000

http://p4web.freebsd.org/@@194681?ac=10

Change 194681 by ilya@ilya_triton2011 on 2011/06/13 15:32:38

	Fix FUSE_LOCK and FUSE_UNLOCK macros

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#6 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#5 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#6 (text+ko) ====

@@ -105,11 +105,11 @@
 
 #if USE_FUSE_LOCK
 extern struct mtx fuse_mtx;
-#define FUSE_LOCK mtx_lock(&fuse_mtx)
-#define FUSE_UNLOCK mtx_unlock(&fuse_mtx)
+#define FUSE_LOCK() mtx_lock(&fuse_mtx)
+#define FUSE_UNLOCK() mtx_unlock(&fuse_mtx)
 #else
-#define FUSE_LOCK
-#define FUSE_UNLOCK
+#define FUSE_LOCK()
+#define FUSE_UNLOCK()
 #endif
 
 #define RECTIFY_TDCR(td, cred)			\

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#5 (text+ko) ====

@@ -119,9 +119,9 @@
 
 	fdata = fdata_alloc(dev, td->td_ucred);
 
-	FUSE_LOCK;
+	FUSE_LOCK();
 	if (fusedev_get_data(dev)) {
-		FUSE_UNLOCK;
+		FUSE_UNLOCK();
 		fdata_destroy(fdata);
 		goto busy;
 	} else {
@@ -131,7 +131,7 @@
 		fdata->dataflag |= FSESS_OPENED;
 		dev->si_drv1 = fdata;
 	}	
-	FUSE_UNLOCK;
+	FUSE_UNLOCK();
 #if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK
 	mtx_unlock(&Giant);
 #endif
@@ -159,7 +159,7 @@
 #if DO_GIANT_MANUALLY && ! USE_FUSE_LOCK
 	mtx_lock(&Giant);
 #endif
-	FUSE_LOCK;
+	FUSE_LOCK();
 	data = fusedev_get_data(dev);
 	if (! data)
 		panic("no fuse data upon fuse device close");
@@ -186,11 +186,11 @@
 		}
 		mtx_unlock(&data->aw_mtx);
 
-		FUSE_UNLOCK;
+		FUSE_UNLOCK();
 		goto out;
 	}
 	dev->si_drv1 = NULL;
-	FUSE_UNLOCK;
+	FUSE_UNLOCK();
 
 	fdata_destroy(data);