[src/netbsd-6-0]: src/sys/fs/nilfs Pull up following revision(s) (requested b...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/83313e424adc
branches:  netbsd-6-0
changeset: 774816:83313e424adc
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jun 13 10:53:00 2013 +0000

description:
Pull up following revision(s) (requested by reinoud in ticket #894):
        sys/fs/nilfs/nilfs_vnops.c: revision 1.22-1.23
Fix serious file read problem due to not-so-clear VOP_BMAP description. Should
fix PR 45605.

diffstat:

 sys/fs/nilfs/nilfs_vnops.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 2e433277c2ac -r 83313e424adc sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c        Wed Jun 12 04:44:50 2013 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c        Thu Jun 13 10:53:00 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.16.6.1 2012/08/12 12:59:47 martin Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.16.6.1.4.1 2013/06/13 10:53:00 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.16.6.1 2012/08/12 12:59:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.16.6.1.4.1 2013/06/13 10:53:00 msaitoh Exp $");
 #endif /* not lint */
 
 
@@ -315,6 +315,11 @@
 /*
  * bmap functionality that translates logical block numbers to the virtual
  * block numbers to be stored on the vnode itself.
+ *
+ * Important alert!
+ *
+ * If runp is not NULL, the number of contiguous blocks __starting from the
+ * next block after the queried block__ will be returned in runp.
  */
 
 int
@@ -364,7 +369,8 @@
        run = 1;
        while ((run < blks) && (l2vmap[run] == *bnp + run))
                run++;
-       
+       run--;  /* see comment at start of function */
+
        /* set runlength */
        if (runp)
                *runp = run;