[src/trunk]: src/sys/ufs/lfs Fix up indirect block handling in truncate to be...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cae6449b9f16
branches:  trunk
changeset: 340339:cae6449b9f16
user:      dholland <dholland%NetBSD.org@localhost>
date:      Tue Sep 01 06:13:09 2015 +0000

description:
Fix up indirect block handling in truncate to be 32/64 clean.

diffstat:

 sys/ufs/lfs/lfs_accessors.h |   7 +------
 sys/ufs/lfs/lfs_inode.c     |  40 ++++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diffs (123 lines):

diff -r 3a55d84fcb74 -r cae6449b9f16 sys/ufs/lfs/lfs_accessors.h
--- a/sys/ufs/lfs/lfs_accessors.h       Tue Sep 01 06:12:33 2015 +0000
+++ b/sys/ufs/lfs/lfs_accessors.h       Tue Sep 01 06:13:09 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_accessors.h,v 1.20 2015/09/01 06:12:33 dholland Exp $      */
+/*     $NetBSD: lfs_accessors.h,v 1.21 2015/09/01 06:13:09 dholland Exp $      */
 
 /*  from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp  */
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
@@ -214,11 +214,6 @@
 #define LFS_MAXSYMLINKLEN(fs) \
        ((fs)->lfs_is64 ? LFS64_MAXSYMLINKLEN : LFS32_MAXSYMLINKLEN)
 
-/* get rid of this eventually */
-#define ULFS_MAXSYMLINKLEN(ip) \
-       ((ip)->i_ump->um_fstype == ULFS1) ? \
-       LFS32_MAXSYMLINKLEN : LFS64_MAXSYMLINKLEN
-
 #define DINOSIZE(fs) ((fs)->lfs_is64 ? sizeof(struct lfs64_dinode) : sizeof(struct lfs32_dinode))
 
 #define DINO_IN_BLOCK(fs, base, ix) \
diff -r 3a55d84fcb74 -r cae6449b9f16 sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c   Tue Sep 01 06:12:33 2015 +0000
+++ b/sys/ufs/lfs/lfs_inode.c   Tue Sep 01 06:13:09 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.c,v 1.146 2015/09/01 06:08:37 dholland Exp $ */
+/*     $NetBSD: lfs_inode.c,v 1.147 2015/09/01 06:13:09 dholland 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_inode.c,v 1.146 2015/09/01 06:08:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.147 2015/09/01 06:13:09 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -726,10 +726,10 @@
        int i;
        struct buf *bp;
        struct lfs *fs = ip->i_lfs;
-       int32_t *bap;   /* XXX ondisk32 */
+       void *bap;
+       bool bap_needs_free;
        struct vnode *vp;
        daddr_t nb, nlbn, last;
-       int32_t *copy = NULL;   /* XXX ondisk32 */
        daddr_t blkcount, rblkcount, factor;
        int nblocks;
        daddr_t blocksreleased = 0, real_released = 0;
@@ -777,17 +777,25 @@
                return (error);
        }
 
-       bap = (int32_t *)bp->b_data;    /* XXX ondisk32 */
        if (lastbn >= 0) {
-               copy = lfs_malloc(fs, lfs_sb_getbsize(fs), LFS_NB_IBLOCK);
-               memcpy((void *)copy, (void *)bap, lfs_sb_getbsize(fs));
-               memset((void *)&bap[last + 1], 0,
-               /* XXX ondisk32 */
-                 (u_int)(LFS_NINDIR(fs) - (last + 1)) * sizeof (int32_t));
+               /*
+                * We still need this block, so copy the data for
+                * subsequent processing; then in the original block,
+                * zero out the dying block pointers and send it off.
+                */
+               bap = lfs_malloc(fs, lfs_sb_getbsize(fs), LFS_NB_IBLOCK);
+               memcpy(bap, bp->b_data, lfs_sb_getbsize(fs));
+               bap_needs_free = true;
+
+               for (i = last + 1; i < LFS_NINDIR(fs); i++) {
+                       lfs_iblock_set(fs, bp->b_data, i, 0);
+               }
                error = VOP_BWRITE(bp->b_vp, bp);
                if (error)
                        allerror = error;
-               bap = copy;
+       } else {
+               bap = bp->b_data;
+               bap_needs_free = false;
        }
 
        /*
@@ -795,7 +803,7 @@
         */
        for (i = LFS_NINDIR(fs) - 1, nlbn = lbn + 1 - i * factor; i > last;
            i--, nlbn += factor) {
-               nb = bap[i];
+               nb = lfs_iblock_get(fs, bap, i);
                if (nb == 0)
                        continue;
                if (level > SINGLE) {
@@ -809,7 +817,7 @@
                        real_released += rblkcount;
                }
                lfs_blkfree(fs, ip, nb, lfs_sb_getbsize(fs), lastsegp, bcp);
-               if (bap[i] > 0)
+               if (lfs_iblock_get(fs, bap, i) > 0)
                        real_released += nblocks;
                blocksreleased += nblocks;
        }
@@ -819,7 +827,7 @@
         */
        if (level > SINGLE && lastbn >= 0) {
                last = lastbn % factor;
-               nb = bap[i];
+               nb = lfs_iblock_get(fs, bap, i);
                if (nb != 0) {
                        error = lfs_indirtrunc(ip, nlbn, nb,
                                               last, level - 1, &blkcount,
@@ -831,8 +839,8 @@
                }
        }
 
-       if (copy != NULL) {
-               lfs_free(fs, copy, LFS_NB_IBLOCK);
+       if (bap_needs_free) {
+               lfs_free(fs, bap, LFS_NB_IBLOCK);
        } else {
                mutex_enter(&bufcache_lock);
                if (bp->b_oflags & BO_DELWRI) {