Date: Tue, 18 Jun 2013 15:31:44 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251951 - stable/9/sys/kern Message-ID: <201306181531.r5IFVikH006333@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Jun 18 15:31:43 2013 New Revision: 251951 URL: http://svnweb.freebsd.org/changeset/base/251951 Log: Remove diff from head after manual r251942 merge. Reviewed by: scottl Modified: stable/9/sys/kern/kern_physio.c Modified: stable/9/sys/kern/kern_physio.c ============================================================================== --- stable/9/sys/kern/kern_physio.c Tue Jun 18 15:22:16 2013 (r251950) +++ stable/9/sys/kern/kern_physio.c Tue Jun 18 15:31:43 2013 (r251951) @@ -38,7 +38,7 @@ physio(struct cdev *dev, struct uio *uio struct cdevsw *csw; caddr_t sa; u_int iolen; - int error, i; + int error, i, mapped; /* Keep the process UPAGES from being swapped. XXX: why ? */ PHOLD(curproc); @@ -90,10 +90,9 @@ physio(struct cdev *dev, struct uio *uio bp->b_bufsize = bp->b_bcount; bp->b_blkno = btodb(bp->b_offset); + csw = dev->si_devsw; if (uio->uio_segflg == UIO_USERSPACE) { - int mapped; - if (csw != NULL && (csw->d_flags & D_UNMAPPED_IO) != 0) mapped = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306181531.r5IFVikH006333>