From owner-svn-src-head@freebsd.org  Sat Jul 30 17:45:57 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C93DFBA8441;
 Sat, 30 Jul 2016 17:45:57 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 95F401F6E;
 Sat, 30 Jul 2016 17:45:57 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6UHju1T033814;
 Sat, 30 Jul 2016 17:45:56 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6UHju8p033813;
 Sat, 30 Jul 2016 17:45:56 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201607301745.u6UHju8p033813@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sat, 30 Jul 2016 17:45:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303555 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2016 17:45:57 -0000

Author: allanjude
Date: Sat Jul 30 17:45:56 2016
New Revision: 303555
URL: https://svnweb.freebsd.org/changeset/base/303555

Log:
  bcache should support reads shorter than sector size
  
  dosfs (fat file systems) can perform reads of partial sectors
  bcache should support such reads.
  
  Submitted by:	Toomas Soome <tsoome@me.com>
  Reviewed by:	cem
  Differential Revision:	https://reviews.freebsd.org/D6475

Modified:
  head/sys/boot/common/bcache.c

Modified: head/sys/boot/common/bcache.c
==============================================================================
--- head/sys/boot/common/bcache.c	Sat Jul 30 15:56:36 2016	(r303554)
+++ head/sys/boot/common/bcache.c	Sat Jul 30 17:45:56 2016	(r303555)
@@ -303,7 +303,9 @@ read_strategy(void *devdata, int rw, dad
 	    break;
     }
 
-    size = i * bcache_blksize;
+    if (size > i * bcache_blksize)
+	size = i * bcache_blksize;
+
     if (size != 0) {
 	bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)) + offset,
 	    buf, size);