Module Name: src
Committed By: maya
Date: Thu Apr 6 03:15:03 UTC 2017
Modified Files:
src/sys/ufs/lfs: lfs_segment.c
Log Message:
remove deprecated comment (and move it below assert)
there's no spl dance for I/O here.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/ufs/lfs/lfs_segment.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.267 src/sys/ufs/lfs/lfs_segment.c:1.268
--- src/sys/ufs/lfs/lfs_segment.c:1.267 Thu Apr 6 02:38:08 2017
+++ src/sys/ufs/lfs/lfs_segment.c Thu Apr 6 03:15:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.267 2017/04/06 02:38:08 maya Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.268 2017/04/06 03:15:03 maya Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.267 2017/04/06 02:38:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.268 2017/04/06 03:15:03 maya Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -1304,12 +1304,10 @@ lfs_gatherblock(struct segment *sp, stru
int j, blksinblk;
ASSERT_SEGLOCK(sp->fs);
- /*
- * If full, finish this segment. We may be doing I/O, so
- * release and reacquire the splbio().
- */
KASSERTMSG((sp->vp != NULL),
"lfs_gatherblock: Null vp in segment");
+
+ /* If full, finish this segment. */
fs = sp->fs;
blksinblk = howmany(bp->b_bcount, lfs_sb_getbsize(fs));
if (sp->sum_bytes_left < sizeof(int32_t) * blksinblk ||
