Thu Jun 13 10:53:00 2013 UTC ()

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.


(msaitoh)

diff -r1.16.6.1 -r1.16.6.1.4.1 src/sys/fs/nilfs/nilfs_vnops.c

--- src/sys/fs/nilfs/nilfs_vnops.c 2012/08/12 12:59:47	1.16.6.1
+++ src/sys/fs/nilfs/nilfs_vnops.c 2013/06/13 10:53:00	1.16.6.1.4.1

 @@ -1,14 +1,14 @@
-/* $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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #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 */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 @@ -305,26 +305,31 @@ return EIO;
 		if ((resid > uio->uio_resid) && ((ioflag & IO_SYNC) == IO_SYNC))
 			error = nilfs_update(vp, NULL, NULL, NULL, UPDATE_WAIT);
+	}
 	return error;
+}
 /* --------------------------------------------------------------------- */
 /*
  * 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
 nilfs_trivial_bmap(void *v)
+{
 	struct vop_bmap_args /* {
 		struct vnode *a_vp;
 		daddr_t a_bn;
 		struct vnode **a_vpp;
 		daddr_t *a_bnp;
 		int *a_runp;
 	} */ *ap = v;
 	struct vnode  *vp  = ap->a_vp;	/* our node	*/
 @@ -354,27 +359,28 @@ nilfs_trivial_bmap(void *v)
+	}
 	/* store virtual blocks on our own vp */
 	if (vpp)
 		*vpp = vp;
 	/* start at virt[0] */
 	*bnp = l2vmap[0];
 	/* get runlength */
 	run = 1;
 	while ((run < blks) && (l2vmap[run] == *bnp + run))
 		run++;
 	run--;	/* see comment at start of function */
 	/* set runlength */
 	if (runp)
 		*runp = run;
 	DPRINTF(TRANSLATE, ("\tstart %"PRIu64" -> %"PRIu64" run %d\n",
 		bn, *bnp, run));
 	/* mark not translated on virtual block number 0 */
 	if (*bnp == 0)
 		*bnp = -1;
 	/* return success */
 	free(l2vmap, M_TEMP);