Date: Mon, 13 Jun 2011 15:33:42 GMT From: Ilya Putsikau <ilya@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 194681 for review Message-ID: <201106131533.p5DFXgbW074426@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106131533.p5DFXgbW074426>