Module Name: src Committed By: msaitoh Date: Fri Aug 14 05:29:14 UTC 2015
Modified Files: src/sys/ufs/ffs [netbsd-7]: ffs_alloc.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #949): sys/ufs/ffs/ffs_alloc.c: revision 1.151 Need wapbl transaction around ffs_blkfree_cg. Fixes wapbl+discard. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.146.2.1 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.146 src/sys/ufs/ffs/ffs_alloc.c:1.146.2.1 --- src/sys/ufs/ffs/ffs_alloc.c:1.146 Fri Jul 25 08:24:31 2014 +++ src/sys/ufs/ffs/ffs_alloc.c Fri Aug 14 05:29:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_alloc.c,v 1.146 2014/07/25 08:24:31 dholland Exp $ */ +/* $NetBSD: ffs_alloc.c,v 1.146.2.1 2015/08/14 05:29:14 msaitoh 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.146 2014/07/25 08:24:31 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.146.2.1 2015/08/14 05:29:14 msaitoh Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -1604,12 +1604,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; }