Date: Fri, 8 Feb 2008 04:13:46 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135007 for review Message-ID: <200802080413.m184Dkuj076971@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135007 Change 135007 by kmacy@kmacy:entropy:iwarp on 2008/02/08 04:12:59 revert local aio changes Affected files ... .. //depot/projects/iwarp/sys/kern/vfs_aio.c#6 edit Differences ... ==== //depot/projects/iwarp/sys/kern/vfs_aio.c#6 (text+ko) ==== @@ -496,31 +496,6 @@ return (0); } -static aio_op_t -aio_op_get(struct file *fp) -{ - struct socket *so; - aio_op_t op; - struct sockopt sopt; - socklen_t valsize; - int error; - - if (fp->f_type != DTYPE_SOCKET) - return (NULL); - - sopt.sopt_dir = SOPT_GET; - sopt.sopt_level = 0; - sopt.sopt_name = TCP_AIO; - sopt.sopt_val = &op; - sopt.sopt_valsize = sizeof(aio_op_t); - sopt.sopt_tp = NULL; - so = fp->f_data;g - if ((error = sogetopt(so, &sopt)) != 0) - return (NULL); - - return (op); -} - /* * Init the per-process aioinfo structure. The aioinfo limits are set * per-process for user limit (resource) management. @@ -1362,7 +1337,6 @@ struct kaioinfo *ki; struct kevent kev; struct sockbuf *sb; - aio_op_t op; int opcode; int error; int fd, kqfd; @@ -1500,26 +1474,11 @@ suword(&job->_aiocb_private.error, EINPROGRESS); aiocbe->uaiocb._aiocb_private.error = EINPROGRESS; - - op = aio_op_get(fp); - if (op != NULL) { - error = op(fp, &aiocbe->uaiocb, job, td); - if (error && error != ECANCELED) - fdrop(fp, td); - - if (error == ECANCELED) - error = 0; - else { - uma_zfree(aiocb_zone, aiocbe); - goto done; - } - } aiocbe->userproc = p; aiocbe->cred = crhold(td->td_ucred); aiocbe->jobflags = 0; aiocbe->lio = lj; - if (opcode == LIO_SYNC) goto queueit; @@ -1537,7 +1496,6 @@ * Note if opcode is neither LIO_WRITE nor LIO_READ we lock * and unlock the snd sockbuf for no reason. */ - so = fp->f_data; sb = (opcode == LIO_READ) ? &so->so_rcv : &so->so_snd; SOCKBUF_LOCK(sb);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802080413.m184Dkuj076971>