Module Name: src
Committed By: riastradh
Date: Wed Aug 12 14:52:35 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_alloc.c
Log Message:
Need wapbl transaction around ffs_blkfree_cg. Fixes wapbl+discard.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/ufs/ffs/ffs_alloc.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_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.150 src/sys/ufs/ffs/ffs_alloc.c:1.151
--- src/sys/ufs/ffs/ffs_alloc.c:1.150 Sat Aug 8 08:18:52 2015
+++ src/sys/ufs/ffs/ffs_alloc.c Wed Aug 12 14:52:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.150 2015/08/08 08:18:52 mlelstv Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.151 2015/08/12 14:52:35 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.150 2015/08/08 08:18:52 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.151 2015/08/12 14:52:35 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1553,12 +1553,21 @@ struct discarddata {
static void
ffs_blkfree_td(struct fs *fs, struct discardopdata *td)
{
+ struct mount *mp = spec_node_getmountedfs(td->devvp);
long todo;
+ int error;
while (td->size) {
todo = min(td->size,
ffs_lfragtosize(fs, (fs->fs_frag - ffs_fragnum(fs, td->bno))));
+ error = UFS_WAPBL_BEGIN(mp);
+ if (error) {
+ printf("ffs: failed to begin wapbl transaction"
+ " for discard: %d\n", error);
+ break;
+ }
ffs_blkfree_cg(fs, td->devvp, td->bno, todo);
+ UFS_WAPBL_END(mp);
td->bno += ffs_numfrags(fs, todo);
td->size -= todo;
}
