Module Name: src
Committed By: jdolecek
Date: Mon Nov 7 21:14:23 UTC 2016
Modified Files:
src/sys/ufs/ffs: ffs_inode.c
Log Message:
fix broken test for partial truncate, introduced in rev 1.118
PR kern/51601 kern/51602
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/ufs/ffs/ffs_inode.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/ffs/ffs_inode.c
diff -u src/sys/ufs/ffs/ffs_inode.c:1.119 src/sys/ufs/ffs/ffs_inode.c:1.120
--- src/sys/ufs/ffs/ffs_inode.c:1.119 Mon Nov 7 21:05:38 2016
+++ src/sys/ufs/ffs/ffs_inode.c Mon Nov 7 21:14:23 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_inode.c,v 1.119 2016/11/07 21:05:38 jdolecek Exp $ */
+/* $NetBSD: ffs_inode.c,v 1.120 2016/11/07 21:14:23 jdolecek Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.119 2016/11/07 21:05:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.120 2016/11/07 21:14:23 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -686,7 +686,7 @@ ffs_indirtrunc(struct inode *ip, daddr_t
}
out:
- if (RBAP(ip, 0) == 0) {
+ if (lastbn < 0 && error == 0) {
/* all freed, release without writing back */
brelse(bp, BC_INVAL);
} else {
