Date: Tue, 10 Feb 2009 20:27:05 +0000 (UTC) From: Maksim Yevmenkin <emax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r188452 - head/sys/netgraph/bluetooth/socket Message-ID: <200902102027.n1AKR5V7003528@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emax Date: Tue Feb 10 20:27:05 2009 New Revision: 188452 URL: http://svn.freebsd.org/changeset/base/188452 Log: Update comment. soalloc() is no longer performing M_WAITOK memory allocations. Submitted by: ru MFC after: 3 days Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Modified: head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c ============================================================================== --- head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Tue Feb 10 20:08:03 2009 (r188451) +++ head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Tue Feb 10 20:27:05 2009 (r188452) @@ -518,13 +518,9 @@ ng_btsocket_rfcomm_connect(struct socket return (EDESTADDRREQ); /* - * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e. - * soalloc() is allowed to sleep in MALLOC. This creates "could sleep" - * WITNESS warnings. To work around this problem we will create L2CAP - * socket first and then check if we actually need it. Note that we - * will not check for errors in socreate() because if we failed to - * create L2CAP socket at this point we still might have already open - * session. + * Note that we will not check for errors in socreate() because + * if we failed to create L2CAP socket at this point we still + * might have already open session. */ error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET, @@ -857,13 +853,9 @@ ng_btsocket_rfcomm_listen(struct socket mtx_unlock(&pcb->pcb_mtx); /* - * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e. - * soalloc() is allowed to sleep in MALLOC. This creates "could sleep" - * WITNESS warnings. To work around this problem we will create L2CAP - * socket first and then check if we actually need it. Note that we - * will not check for errors in socreate() because if we failed to - * create L2CAP socket at this point we still might have already open - * session. + * Note that we will not check for errors in socreate() because + * if we failed to create L2CAP socket at this point we still + * might have already open session. */ socreate_error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902102027.n1AKR5V7003528>