35c35
< * $FreeBSD: head/sys/geom/geom_disk.c 109623 2003-01-21 08:56:16Z alfred $
---
> * $FreeBSD: head/sys/geom/geom_disk.c 110052 2003-01-29 19:47:25Z phk $
39d38
< #ifndef NO_GEOM
69a69,82
> static void __inline
> g_disk_lock_giant(struct disk *dp)
> {
> if (!(dp->d_devsw->d_flags & D_NOGIANT))
> mtx_lock(&Giant);
> }
>
> static void __inline
> g_disk_unlock_giant(struct disk *dp)
> {
> if (!(dp->d_devsw->d_flags & D_NOGIANT))
> mtx_unlock(&Giant);
> }
>
86c99
< mtx_lock(&Giant);
---
> g_disk_lock_giant(dp);
90c103
< mtx_unlock(&Giant);
---
> g_disk_unlock_giant(dp);
94c107
< mtx_lock(&Giant);
---
> g_disk_lock_giant(dp);
98c111
< mtx_unlock(&Giant);
---
> g_disk_unlock_giant(dp);
128a142
> struct disk *dp;
130c144
< mtx_unlock(&Giant);
---
> dp = bp->bio_caller1;
132,133c146,152
< g_std_done(bp);
< mtx_lock(&Giant);
---
> if (!(dp->d_devsw->d_flags & D_NOGIANT)) {
> DROP_GIANT();
> g_std_done(bp);
> PICKUP_GIANT();
> } else {
> g_std_done(bp);
> }
163c182,183
< mtx_lock(&Giant);
---
> bp2->bio_caller1 = dp;
> g_disk_lock_giant(dp);
165c185
< mtx_unlock(&Giant);
---
> g_disk_unlock_giant(dp);
320d339
< #endif