Module Name: src
Committed By: dholland
Date: Sat Oct 3 08:28:16 UTC 2015
Modified Files:
src/sbin/fsck_lfs: segwrite.c
src/sys/ufs/lfs: lfs_accessors.h lfs_segment.c lfs_subr.c
Log Message:
Use IINFO in lfs_writeinode().
(both the kernel and the userland copies)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.34 -r1.35 src/sys/ufs/lfs/lfs_accessors.h
cvs rdiff -u -r1.259 -r1.260 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.85 -r1.86 src/sys/ufs/lfs/lfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.44 src/sbin/fsck_lfs/segwrite.c:1.45
--- src/sbin/fsck_lfs/segwrite.c:1.44 Tue Sep 1 06:15:02 2015
+++ src/sbin/fsck_lfs/segwrite.c Sat Oct 3 08:28:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.44 2015/09/01 06:15:02 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.45 2015/10/03 08:28:15 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -254,7 +254,8 @@ lfs_writeinode(struct lfs * fs, struct s
SEGSUM *ssp;
daddr_t daddr;
ino_t ino;
- int i, ndx, fsb = 0;
+ IINFO *iip;
+ int i, fsb = 0;
int redo_ifile = 0;
struct timespec ts;
int gotblk = 0;
@@ -289,10 +290,10 @@ lfs_writeinode(struct lfs * fs, struct s
/* Set remaining space counters. */
sp->seg_bytes_left -= lfs_sb_getibsize(fs);
sp->sum_bytes_left -= LFS_BLKPTRSIZE(fs);
- ndx = lfs_sb_getsumsize(fs) / sizeof(uint32_t) -
- sp->ninodes / LFS_INOPB(fs) - 1;
- /* XXX ondisk32 */
- ((uint32_t *) (sp->segsum))[ndx] = daddr;
+
+ /* Store the address in the segment summary. */
+ iip = NTH_IINFO(fs, sp->segsum, sp->ninodes / LFS_INOPB(fs));
+ lfs_ii_setblock(fs, iip, daddr);
}
/* Update the inode times and copy the inode onto the inode page. */
ts.tv_nsec = 0;
Index: src/sys/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.34 src/sys/ufs/lfs/lfs_accessors.h:1.35
--- src/sys/ufs/lfs/lfs_accessors.h:1.34 Sat Oct 3 08:27:38 2015
+++ src/sys/ufs/lfs/lfs_accessors.h Sat Oct 3 08:28:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_accessors.h,v 1.34 2015/10/03 08:27:38 dholland Exp $ */
+/* $NetBSD: lfs_accessors.h,v 1.35 2015/10/03 08:28:16 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 */
@@ -779,6 +779,9 @@ lfs_fi_setblock(STRUCT_LFS *fs, FINFO *f
#define NEXTLOWER_IINFO(fs, iip) \
((IINFO *)((char *)(iip) - IINFOSIZE(fs)))
+#define NTH_IINFO(fs, buf, n) \
+ ((IINFO *)((char *)SEGSUM_IINFOSTART(fs, buf) - (n)*IINFOSIZE(fs)))
+
static __unused inline uint64_t
lfs_ii_getblock(STRUCT_LFS *fs, IINFO *iip)
{
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.259 src/sys/ufs/lfs/lfs_segment.c:1.260
--- src/sys/ufs/lfs/lfs_segment.c:1.259 Tue Sep 1 06:08:37 2015
+++ src/sys/ufs/lfs/lfs_segment.c Sat Oct 3 08:28:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.259 2015/09/01 06:08:37 dholland Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.260 2015/10/03 08:28:16 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_segment.c,v 1.259 2015/09/01 06:08:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.260 2015/10/03 08:28:16 dholland Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -1032,7 +1032,8 @@ lfs_writeinode(struct lfs *fs, struct se
union lfs_dinode *cdp;
struct vnode *vp = ITOV(ip);
daddr_t daddr;
- int i, ndx;
+ IINFO *iip;
+ int i;
int redo_ifile = 0;
int gotblk = 0;
int count;
@@ -1116,10 +1117,10 @@ lfs_writeinode(struct lfs *fs, struct se
/* Set remaining space counters. */
sp->seg_bytes_left -= lfs_sb_getibsize(fs);
sp->sum_bytes_left -= sizeof(int32_t);
- ndx = lfs_sb_getsumsize(fs) / sizeof(int32_t) -
- sp->ninodes / LFS_INOPB(fs) - 1;
- /* XXX ondisk32 */
- ((int32_t *)(sp->segsum))[ndx] = daddr;
+
+ /* Store the address in the segment summary. */
+ iip = NTH_IINFO(fs, sp->segsum, sp->ninodes / LFS_INOPB(fs));
+ lfs_ii_setblock(fs, iip, daddr);
}
/* Check VU_DIROP in case there is a new file with no data blocks */
Index: src/sys/ufs/lfs/lfs_subr.c
diff -u src/sys/ufs/lfs/lfs_subr.c:1.85 src/sys/ufs/lfs/lfs_subr.c:1.86
--- src/sys/ufs/lfs/lfs_subr.c:1.85 Wed Aug 12 18:25:04 2015
+++ src/sys/ufs/lfs/lfs_subr.c Sat Oct 3 08:28:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_subr.c,v 1.85 2015/08/12 18:25:04 dholland Exp $ */
+/* $NetBSD: lfs_subr.c,v 1.86 2015/10/03 08:28:16 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_subr.c,v 1.85 2015/08/12 18:25:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.86 2015/10/03 08:28:16 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,6 +145,7 @@ lfs_setup_resblks(struct lfs *fs)
"lfsclpl", &pool_allocator_nointr, IPL_NONE);
pool_init(&fs->lfs_segpool, sizeof(struct segment), 0, 0, 0,
"lfssegpool", &pool_allocator_nointr, IPL_NONE);
+ /* XXX: should this int32 be 32/64? */
maxbpp = ((lfs_sb_getsumsize(fs) - SEGSUM_SIZE(fs)) / sizeof(int32_t) + 2);
maxbpp = MIN(maxbpp, lfs_segsize(fs) / lfs_sb_getfsize(fs) + 2);
pool_init(&fs->lfs_bpppool, maxbpp * sizeof(struct buf *), 0, 0, 0,
