Date: Tue, 29 Jul 2014 07:40:14 +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-10@freebsd.org Subject: svn commit: r269226 - stable/10/sys/cam/ctl Message-ID: <201407290740.s6T7eE19016804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Jul 29 07:40:14 2014 New Revision: 269226 URL: http://svnweb.freebsd.org/changeset/base/269226 Log: MFC r269122: Fix infinite loop, when doing WRITE SAME on file-backed LUN. Modified: stable/10/sys/cam/ctl/ctl_backend_block.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_backend_block.c Tue Jul 29 07:36:38 2014 (r269225) +++ stable/10/sys/cam/ctl/ctl_backend_block.c Tue Jul 29 07:40:14 2014 (r269226) @@ -725,10 +725,11 @@ ctl_be_block_dispatch_file(struct ctl_be } /* - * If this is a write, we're all done. + * If this is a write or a verify, we're all done. * If this is a read, we can now send the data to the user. */ - if (ARGS(io)->flags & (CTL_LLF_WRITE | CTL_LLF_VERIFY)) { + if ((beio->bio_cmd == BIO_WRITE) || + (ARGS(io)->flags & CTL_LLF_VERIFY)) { ctl_set_success(&io->scsiio); ctl_complete_beio(beio); } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407290740.s6T7eE19016804>