Page MenuHomeFreeBSD
Files F157671094

D1809.diff
No OneTemporary
Actions

D1809.diff
View Options

Index: sys/dev/cxgbe/tom/t4_ddp.c
===================================================================
--- sys/dev/cxgbe/tom/t4_ddp.c
+++ sys/dev/cxgbe/tom/t4_ddp.c
@@ -924,7 +924,7 @@
while (toep->ddp_flags & buf_flag) {
/* XXXGL: shouldn't here be sbwait() call? */
sb->sb_flags |= SB_WAIT;
- msleep(&sb->sb_acc, &sb->sb_mtx, PSOCK , "sbwait", 0);
+ msleep(&sb->sb_acc, SOCKBUF_MTX(sb), PSOCK , "sbwait", 0);
}
unwire_ddp_buffer(db);
return (rc);
Index: sys/dev/iscsi/icl_soft.c
===================================================================
--- sys/dev/iscsi/icl_soft.c
+++ sys/dev/iscsi/icl_soft.c
@@ -795,7 +795,7 @@
available = sbavail(&so->so_rcv);
if (available < ic->ic_receive_len) {
so->so_rcv.sb_lowat = ic->ic_receive_len;
- cv_wait(&ic->ic_receive_cv, &so->so_rcv.sb_mtx);
+ cv_wait(&ic->ic_receive_cv, SOCKBUF_MTX(&so->so_rcv));
} else
so->so_rcv.sb_lowat = so->so_rcv.sb_hiwat + 1;
SOCKBUF_UNLOCK(&so->so_rcv);
Index: sys/kern/uipc_sockbuf.c
===================================================================
--- sys/kern/uipc_sockbuf.c
+++ sys/kern/uipc_sockbuf.c
@@ -202,7 +202,7 @@
so->so_snd.sb_state |= SBS_CANTSENDMORE;
sowwakeup_locked(so);
- mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED);
+ SOCKBUF_UNLOCK_ASSERT(&so->so_snd);
}
void
@@ -211,7 +211,7 @@
SOCKBUF_LOCK(&so->so_snd);
socantsendmore_locked(so);
- mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED);
+ SOCKBUF_UNLOCK_ASSERT(&so->so_snd);
}
void
@@ -222,7 +222,7 @@
so->so_rcv.sb_state |= SBS_CANTRCVMORE;
sorwakeup_locked(so);
- mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED);
+ SOCKBUF_UNLOCK_ASSERT(&so->so_snd);
}
void
@@ -231,7 +231,7 @@
SOCKBUF_LOCK(&so->so_rcv);
socantrcvmore_locked(so);
- mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED);
+ SOCKBUF_UNLOCK_ASSERT(&so->so_snd);
}
/*
@@ -244,7 +244,7 @@
SOCKBUF_LOCK_ASSERT(sb);
sb->sb_flags |= SB_WAIT;
- return (msleep_sbt(&sb->sb_acc, &sb->sb_mtx,
+ return (msleep_sbt(&sb->sb_acc, SOCKBUF_MTX(sb),
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait",
sb->sb_timeo, 0, 0));
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 24, 10:29 PM (2 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33473347
Default Alt Text
D1809.diff (2 KB)

Event Timeline