Re: svn commit: r324508 - head/sys/kern
Bezüglich Mark Johnston's Nachricht vom 01.04.2018 18:47 (localtime): > On Sat, Mar 31, 2018 at 11:33:48AM +0200, Harry Schmalzbauer wrote: >> Bezüglich Sean Bruno's Nachricht vom 11.10.2017 00:21 (localtime): >>> Author: sbruno >>> Date: Tue Oct 10 22:21:05 2017 >>> New Revision: 324508 >>> URL: https://svnweb.freebsd.org/changeset/base/324508 >>> >>> Log: >>> match sendfile() error handling to send(). >>> >>> Sendfile() should match the error checking order of send() which >>> is currently: >>> >>> SBS_CANTSENDMORE >>> so_error >>> SS_ISCONNECTED >>> >>> Submitted by: Jason Eggleston >>> Reviewed by: glebius >>> MFC after:2 weeks >>> Sponsored by: Limelight Networks >>> Differential Revision:https://reviews.freebsd.org/D12633 >>> >>> Modified: >>> head/sys/kern/kern_sendfile.c >>> >> >> I'm still applying this one locally to stable/11. >> Is it going to be MFCd before 11.2? >> >> There are a view more candidates: >> https://svnweb.freebsd.org/base?view=revision&revision=324601 along with >> r324448 >> https://svnweb.freebsd.org/base?view=revision&revision=327596 >> https://svnweb.freebsd.org/base?view=revision&revision=328977 >> These were flagged for MFC with expired defer time. >> And tomorrow this one was supposed to be MFCd also: >> https://svnweb.freebsd.org/base?view=revision&revision=331130 > > I think r324446 and r324448 need to be MFCed before most of these can go > in. I MFCed the other commits (r317567, r324508) that you asked about in > other threads. Thanks for MFCing the unrelated other two (r317567, r324508) from cem@! Hope someone finds time to sort out the dependiencies of r324446, r324448 and this r324508 along with r324601, r327596, r328977. Currently I don't have a sendfile() test case, but for some reason I stumbled across this MFCflagged commit some time ago and I guess 11.2 shouldn't ship without. Thanks, -harry ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r324508 - head/sys/kern
On Sat, Mar 31, 2018 at 11:33:48AM +0200, Harry Schmalzbauer wrote: > Bezüglich Sean Bruno's Nachricht vom 11.10.2017 00:21 (localtime): > > Author: sbruno > > Date: Tue Oct 10 22:21:05 2017 > > New Revision: 324508 > > URL: https://svnweb.freebsd.org/changeset/base/324508 > > > > Log: > > match sendfile() error handling to send(). > > > > Sendfile() should match the error checking order of send() which > > is currently: > > > > SBS_CANTSENDMORE > > so_error > > SS_ISCONNECTED > > > > Submitted by: Jason Eggleston > > Reviewed by: glebius > > MFC after:2 weeks > > Sponsored by: Limelight Networks > > Differential Revision:https://reviews.freebsd.org/D12633 > > > > Modified: > > head/sys/kern/kern_sendfile.c > > > > I'm still applying this one locally to stable/11. > Is it going to be MFCd before 11.2? > > There are a view more candidates: > https://svnweb.freebsd.org/base?view=revision&revision=324601 along with > r324448 > https://svnweb.freebsd.org/base?view=revision&revision=327596 > https://svnweb.freebsd.org/base?view=revision&revision=328977 > These were flagged for MFC with expired defer time. > And tomorrow this one was supposed to be MFCd also: > https://svnweb.freebsd.org/base?view=revision&revision=331130 I think r324446 and r324448 need to be MFCed before most of these can go in. I MFCed the other commits (r317567, r324508) that you asked about in other threads. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r324508 - head/sys/kern
Bezüglich Sean Bruno's Nachricht vom 11.10.2017 00:21 (localtime): > Author: sbruno > Date: Tue Oct 10 22:21:05 2017 > New Revision: 324508 > URL: https://svnweb.freebsd.org/changeset/base/324508 > > Log: > match sendfile() error handling to send(). > > Sendfile() should match the error checking order of send() which > is currently: > > SBS_CANTSENDMORE > so_error > SS_ISCONNECTED > > Submitted by: Jason Eggleston > Reviewed by:glebius > MFC after: 2 weeks > Sponsored by: Limelight Networks > Differential Revision: https://reviews.freebsd.org/D12633 > > Modified: > head/sys/kern/kern_sendfile.c > I'm still applying this one locally to stable/11. Is it going to be MFCd before 11.2? There are a view more candidates: https://svnweb.freebsd.org/base?view=revision&revision=324601 along with r324448 https://svnweb.freebsd.org/base?view=revision&revision=327596 https://svnweb.freebsd.org/base?view=revision&revision=328977 These were flagged for MFC with expired defer time. And tomorrow this one was supposed to be MFCd also: https://svnweb.freebsd.org/base?view=revision&revision=331130 Thanks, -harry ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r324508 - head/sys/kern
Author: sbruno Date: Tue Oct 10 22:21:05 2017 New Revision: 324508 URL: https://svnweb.freebsd.org/changeset/base/324508 Log: match sendfile() error handling to send(). Sendfile() should match the error checking order of send() which is currently: SBS_CANTSENDMORE so_error SS_ISCONNECTED Submitted by: Jason Eggleston Reviewed by: glebius MFC after:2 weeks Sponsored by: Limelight Networks Differential Revision:https://reviews.freebsd.org/D12633 Modified: head/sys/kern/kern_sendfile.c Modified: head/sys/kern/kern_sendfile.c == --- head/sys/kern/kern_sendfile.c Tue Oct 10 21:16:07 2017 (r324507) +++ head/sys/kern/kern_sendfile.c Tue Oct 10 22:21:05 2017 (r324508) @@ -507,8 +507,6 @@ sendfile_getsock(struct thread *td, int s, struct file *so = (*sock_fp)->f_data; if ((*so)->so_type != SOCK_STREAM) return (EINVAL); - if (((*so)->so_state & SS_ISCONNECTED) == 0) - return (ENOTCONN); return (0); } @@ -617,6 +615,12 @@ retry_space: SOCKBUF_UNLOCK(&so->so_snd); goto done; } + if ((so->so_state & SS_ISCONNECTED) == 0) { + SOCKBUF_UNLOCK(&so->so_snd); + error = ENOTCONN; + goto done; + } + space = sbspace(&so->so_snd); if (space < rem && (space <= 0 || ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"