Module Name: src
Committed By: riastradh
Date: Sat Aug 26 05:22:50 UTC 2023
Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_bmap.c
ext2fs_bswap.c ext2fs_extents.h ext2fs_extern.h ext2fs_htree.c
ext2fs_inode.c ext2fs_lookup.c ext2fs_rename.c ext2fs_vfsops.c
ext2fs_vnops.c
Log Message:
ext2fs: Nix trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.53 -r1.54 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/ext2fs/ext2fs_bmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ext2fs/ext2fs_extents.h
cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ext2fs/ext2fs_htree.c
cvs rdiff -u -r1.90 -r1.91 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.93 -r1.94 src/sys/ufs/ext2fs/ext2fs_lookup.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/ext2fs/ext2fs_rename.c
cvs rdiff -u -r1.222 -r1.223 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.137 -r1.138 src/sys/ufs/ext2fs/ext2fs_vnops.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/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.50 src/sys/ufs/ext2fs/ext2fs.h:1.51
--- src/sys/ufs/ext2fs/ext2fs.h:1.50 Sat Aug 26 05:18:17 2023
+++ src/sys/ufs/ext2fs/ext2fs.h Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.50 2023/08/26 05:18:17 riastradh Exp $ */
+/* $NetBSD: ext2fs.h,v 1.51 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -177,7 +177,7 @@ struct ext2fs {
uint8_t e2fs_prealloc; /* # of blocks to preallocate */
uint8_t e2fs_dir_prealloc; /* # of blocks to preallocate for dir */
uint16_t e2fs_reserved_ngdb; /* # of reserved gd blocks for resize */
-
+
/* Additional fields */
char e3fs_journal_uuid[16];/* uuid of journal superblock */
uint32_t e3fs_journal_inum; /* inode number of journal file */
@@ -356,7 +356,7 @@ struct m_ext2fs {
* - EXT2F_ROCOMPAT_SPARSESUPER
* superblock backups stored only in cg_has_sb(bno) groups
* - EXT2F_ROCOMPAT_LARGEFILE
- * use e2di_size_high in struct ext2fs_dinode to store
+ * use e2di_size_high in struct ext2fs_dinode to store
* upper 32bit of size for >2GB files
* - EXT2F_INCOMPAT_FTYPE
* store file type to e2d_type in struct ext2fs_direct
@@ -424,7 +424,7 @@ struct ext2_gd {
uint16_t ext2bgd_ndirs; /* number of directories */
/*
- * Following only valid when either GDT_CSUM (AKA uninit_bg)
+ * Following only valid when either GDT_CSUM (AKA uninit_bg)
* or METADATA_CKSUM feature is on
*/
uint16_t ext2bgd_flags; /* ext4 bg flags (INODE_UNINIT, ...)*/
@@ -450,7 +450,7 @@ struct ext2_gd {
#define E2FS_HAS_GD_CSUM(fs) \
EXT2F_HAS_ROCOMPAT_FEATURE(fs, EXT2F_ROCOMPAT_GDT_CSUM|EXT2F_ROCOMPAT_METADATA_CKSUM) != 0
-
+
/*
* If the EXT2F_ROCOMPAT_SPARSESUPER flag is set, the cylinder group has a
* copy of the super and cylinder group descriptors blocks only if it's
Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.53 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.54
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.53 Fri Aug 25 16:50:23 2023
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_alloc.c,v 1.53 2023/08/25 16:50:23 christos Exp $ */
+/* $NetBSD: ext2fs_alloc.c,v 1.54 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.53 2023/08/25 16:50:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.54 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -667,7 +667,7 @@ ext2fs_cg_update(struct m_ext2fs *fs, in
if (nifree) {
uint32_t ext2bgd_nifree = fs2h16(gd->ext2bgd_nifree) |
(fs2h16(gd->ext2bgd_nifree_hi) << 16);
- ext2bgd_nifree += nifree;
+ ext2bgd_nifree += nifree;
gd->ext2bgd_nifree = h2fs16(ext2bgd_nifree);
gd->ext2bgd_nifree_hi = h2fs16(ext2bgd_nifree >> 16);
/*
@@ -696,7 +696,6 @@ ext2fs_cg_update(struct m_ext2fs *fs, in
ext2bgd_nbfree += nbfree;
gd->ext2bgd_nbfree = h2fs16(ext2bgd_nbfree);
gd->ext2bgd_nbfree_hi = h2fs16(ext2bgd_nbfree >> 16);
-
}
if (ndirs) {
@@ -821,7 +820,7 @@ ext2fs_cg_verify_and_initialize(struct v
(int)fs->e2fs_bsize, 0, 0);
clrbuf(bp);
}
-
+
bdwrite(bp);
}
Index: src/sys/ufs/ext2fs/ext2fs_bmap.c
diff -u src/sys/ufs/ext2fs/ext2fs_bmap.c:1.30 src/sys/ufs/ext2fs/ext2fs_bmap.c:1.31
--- src/sys/ufs/ext2fs/ext2fs_bmap.c:1.30 Sun Aug 14 11:26:35 2016
+++ src/sys/ufs/ext2fs/ext2fs_bmap.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_bmap.c,v 1.30 2016/08/14 11:26:35 jdolecek Exp $ */
+/* $NetBSD: ext2fs_bmap.c,v 1.31 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_bmap.c,v 1.30 2016/08/14 11:26:35 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_bmap.c,v 1.31 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@ ext2fs_bmap(void *v)
*/
static int
ext4_bmapext(struct vnode *vp, int32_t bn, int64_t *bnp, int *runp, int *runb)
-{
+{
struct inode *ip;
struct m_ext2fs *fs;
struct ext4_extent *ep;
Index: src/sys/ufs/ext2fs/ext2fs_bswap.c
diff -u src/sys/ufs/ext2fs/ext2fs_bswap.c:1.24 src/sys/ufs/ext2fs/ext2fs_bswap.c:1.25
--- src/sys/ufs/ext2fs/ext2fs_bswap.c:1.24 Sat Aug 20 19:47:44 2016
+++ src/sys/ufs/ext2fs/ext2fs_bswap.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_bswap.c,v 1.24 2016/08/20 19:47:44 jdolecek Exp $ */
+/* $NetBSD: ext2fs_bswap.c,v 1.25 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.24 2016/08/20 19:47:44 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.25 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/types.h>
#include <ufs/ext2fs/ext2fs.h>
@@ -85,7 +85,7 @@ e2fs_sb_bswap(struct ext2fs *old, struct
void
e2fs_i_bswap(struct ext2fs_dinode *old, struct ext2fs_dinode *new, size_t isize)
{
- /* preserve non-swapped and unused fields */
+ /* preserve non-swapped and unused fields */
memcpy(new, old, isize);
/* swap what needs to be swapped */
Index: src/sys/ufs/ext2fs/ext2fs_extents.h
diff -u src/sys/ufs/ext2fs/ext2fs_extents.h:1.4 src/sys/ufs/ext2fs/ext2fs_extents.h:1.5
--- src/sys/ufs/ext2fs/ext2fs_extents.h:1.4 Tue Aug 9 13:18:50 2016
+++ src/sys/ufs/ext2fs/ext2fs_extents.h Sat Aug 26 05:22:50 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: ext2fs_extents.h,v 1.4 2016/08/09 13:18:50 kre Exp $ */
+/* $NetBSD: ext2fs_extents.h,v 1.5 2023/08/26 05:22:50 riastradh Exp $ */
/*-
* Copyright (c) 2012, 2010 Zheng Liu <l...@freebsd.org>
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -12,7 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -24,9 +24,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* $FreeBSD: head/sys/fs/ext2fs/ext2_extents.h 295523 2016-02-11 15:27:14Z pfg $
- */
+ */
#ifndef _UFS_EXT2FS_EXT2FS_EXTENTS_H_
#define _UFS_EXT2FS_EXT2FS_EXTENTS_H_
Index: src/sys/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.56 src/sys/ufs/ext2fs/ext2fs_extern.h:1.57
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.56 Sun May 28 16:38:55 2017
+++ src/sys/ufs/ext2fs/ext2fs_extern.h Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_extern.h,v 1.56 2017/05/28 16:38:55 hannken Exp $ */
+/* $NetBSD: ext2fs_extern.h,v 1.57 2023/08/26 05:22:50 riastradh Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -135,7 +135,7 @@ int ext2fs_dirrewrite(struct inode *, co
struct inode *, struct componentname *);
int ext2fs_dirempty(struct inode *, ino_t, kauth_cred_t);
int ext2fs_add_entry(struct vnode *, struct ext2fs_direct *,
- const struct ufs_lookup_results *, size_t);
+ const struct ufs_lookup_results *, size_t);
/* ext2fs_subr.c */
int ext2fs_blkatoff(struct vnode *, off_t, char **, struct buf **);
@@ -181,8 +181,8 @@ int ext2fs_reclaim(void *);
/* ext2fs_hash.c */
int ext2fs_htree_hash(const char *, int, uint32_t *, int, uint32_t *,
uint32_t *);
-
-/* ext2fs_htree.c */
+
+/* ext2fs_htree.c */
int ext2fs_htree_has_idx(struct inode *);
int ext2fs_htree_lookup(struct inode *, const char *, int, struct buf **,
int *, doff_t *, doff_t *, doff_t *, struct ext2fs_searchslot *);
Index: src/sys/ufs/ext2fs/ext2fs_htree.c
diff -u src/sys/ufs/ext2fs/ext2fs_htree.c:1.10 src/sys/ufs/ext2fs/ext2fs_htree.c:1.11
--- src/sys/ufs/ext2fs/ext2fs_htree.c:1.10 Wed May 4 07:34:28 2022
+++ src/sys/ufs/ext2fs/ext2fs_htree.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_htree.c,v 1.10 2022/05/04 07:34:28 andvar Exp $ */
+/* $NetBSD: ext2fs_htree.c,v 1.11 2023/08/26 05:22:50 riastradh Exp $ */
/*-
* Copyright (c) 2010, 2012 Zheng Liu <l...@freebsd.org>
@@ -29,7 +29,7 @@
* $FreeBSD: head/sys/fs/ext2fs/ext2fs_htree.c 294653 2016-01-24 02:41:49Z pfg $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_htree.c,v 1.10 2022/05/04 07:34:28 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_htree.c,v 1.11 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_htree
static int ext2fs_htree_find_leaf(struct inode *, const char *, int ,
uint32_t *, uint8_t *, struct ext2fs_htree_lookup_info *);
-
+
int
ext2fs_htree_has_idx(struct inode *ip)
{
@@ -449,7 +449,7 @@ ext2fs_htree_create_index(struct vnode *
(void)bwrite(bp);
else
bdwrite(bp);
-
+
dp->i_flag |= IN_CHANGE | IN_UPDATE;
/*
@@ -504,7 +504,7 @@ ext2fs_htree_add_entry(struct vnode *dvp
fs = &(m_fs->e2fs);
blksize = m_fs->e2fs_bsize;
- if (ip->i_crap.ulr_count != 0)
+ if (ip->i_crap.ulr_count != 0)
return ext2fs_add_entry(dvp, entry, &(ip->i_crap), newentrysize);
/* Target directory block is full, split it */
@@ -536,7 +536,7 @@ ext2fs_htree_add_entry(struct vnode *dvp
error = ext2fs_blkatoff(dvp, cursize, NULL, &dst_bp);
if (error)
goto finish;
-
+
dst_node = (struct ext2fs_htree_node *)dst_bp->b_data;
dst_entries = dst_node->h_entries;
@@ -561,7 +561,7 @@ ext2fs_htree_add_entry(struct vnode *dvp
ext2fs_htree_set_count(dst_entries, dst_ent_num);
ext2fs_htree_set_limit(dst_entries,
ext2fs_htree_node_limit(ip));
-
+
if (info.h_levels[1].h_entry >= entries + src_ent_num) {
struct buf *tmp = info.h_levels[1].h_bp;
info.h_levels[1].h_bp = dst_bp;
Index: src/sys/ufs/ext2fs/ext2fs_inode.c
diff -u src/sys/ufs/ext2fs/ext2fs_inode.c:1.90 src/sys/ufs/ext2fs/ext2fs_inode.c:1.91
--- src/sys/ufs/ext2fs/ext2fs_inode.c:1.90 Tue Aug 17 22:00:33 2021
+++ src/sys/ufs/ext2fs/ext2fs_inode.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_inode.c,v 1.90 2021/08/17 22:00:33 andvar Exp $ */
+/* $NetBSD: ext2fs_inode.c,v 1.91 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.90 2021/08/17 22:00:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.91 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ ext2fs_setnblock(struct inode *ip, uint6
return 0;
}
- if (!EXT2F_HAS_ROCOMPAT_FEATURE(fs, EXT2F_ROCOMPAT_HUGE_FILE))
+ if (!EXT2F_HAS_ROCOMPAT_FEATURE(fs, EXT2F_ROCOMPAT_HUGE_FILE))
return EFBIG;
if (nblock <= 0xffffffffffffULL) {
Index: src/sys/ufs/ext2fs/ext2fs_lookup.c
diff -u src/sys/ufs/ext2fs/ext2fs_lookup.c:1.93 src/sys/ufs/ext2fs/ext2fs_lookup.c:1.94
--- src/sys/ufs/ext2fs/ext2fs_lookup.c:1.93 Thu Aug 10 20:49:19 2023
+++ src/sys/ufs/ext2fs/ext2fs_lookup.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_lookup.c,v 1.93 2023/08/10 20:49:19 mrg Exp $ */
+/* $NetBSD: ext2fs_lookup.c,v 1.94 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Modified for NetBSD 1.2E
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.93 2023/08/10 20:49:19 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.94 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -399,7 +399,7 @@ ext2fs_lookup(void *v)
struct ext2fs_searchslot ss;
numdirpasses = 1;
entryoffsetinblock = 0;
-
+
int htree_lookup_ret = ext2fs_htree_lookup(dp, cnp->cn_nameptr,
cnp->cn_namelen, &bp, &entryoffsetinblock, &i_offset,
&prevoff, &enduseful, &ss);
@@ -715,7 +715,7 @@ found:
}
static void
ext2fs_accumulatespace (struct ext2fs_searchslot *ssp, struct ext2fs_direct *ep,
- doff_t *offp)
+ doff_t *offp)
{
int size = ep->e2d_reclen;
@@ -905,7 +905,7 @@ ext2fs_direnter(struct inode *ip, struct
}
return error;
}
-
+
/*
* TODO check if Htree index is not created for the directory then
* create one if directory entries get overflew the first dir-block
@@ -944,7 +944,7 @@ ext2fs_direnter(struct inode *ip, struct
}
error = ext2fs_add_entry(dvp, &newdir, ulr, newentrysize);
-
+
if (!error && ulr->ulr_endoff && ulr->ulr_endoff < ext2fs_size(dp))
error = ext2fs_truncate(dvp, (off_t)ulr->ulr_endoff, IO_SYNC,
cnp->cn_cred);
@@ -958,8 +958,8 @@ ext2fs_direnter(struct inode *ip, struct
int
ext2fs_add_entry(struct vnode* dvp, struct ext2fs_direct *entry,
- const struct ufs_lookup_results *ulr, size_t newentrysize)
-{
+ const struct ufs_lookup_results *ulr, size_t newentrysize)
+{
struct ext2fs_direct *ep, *nep;
struct inode *dp;
struct buf *bp;
Index: src/sys/ufs/ext2fs/ext2fs_rename.c
diff -u src/sys/ufs/ext2fs/ext2fs_rename.c:1.12 src/sys/ufs/ext2fs/ext2fs_rename.c:1.13
--- src/sys/ufs/ext2fs/ext2fs_rename.c:1.12 Wed Oct 20 03:08:19 2021
+++ src/sys/ufs/ext2fs/ext2fs_rename.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_rename.c,v 1.12 2021/10/20 03:08:19 thorpej Exp $ */
+/* $NetBSD: ext2fs_rename.c,v 1.13 2023/08/26 05:22:50 riastradh Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.12 2021/10/20 03:08:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.13 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -843,7 +843,7 @@ ext2fs_gro_genealogy(struct mount *mp, k
/* Neither -- keep ascending the family tree. */
error = vcache_get(mp, &dotdot_ino, sizeof(dotdot_ino), &dvp);
vput(vp);
- if (error)
+ if (error)
return error;
error = vn_lock(dvp, LK_EXCLUSIVE);
if (error) {
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.222 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.223
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.222 Fri Aug 25 16:50:23 2023
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.222 2023/08/25 16:50:23 christos Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.223 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.222 2023/08/25 16:50:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.223 2023/08/26 05:22:50 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -760,7 +760,7 @@ ext2fs_mountfs(struct vnode *devvp, stru
int32_t sh = m_fs->e2fs_bsize >> m_fs->e2fs_group_desc_shift;
/* XXX: should be added in ext2fs_sbfill()? */
- m_fs->e2fs_gd = kmem_alloc(m_fs->e2fs_ngdb * sh
+ m_fs->e2fs_gd = kmem_alloc(m_fs->e2fs_ngdb * sh
* sizeof(struct ext2_gd), KM_SLEEP);
for (i = 0; i < m_fs->e2fs_ngdb; i++) {
error = bread(devvp,
@@ -1472,4 +1472,3 @@ ext2fs_sbfill(struct m_ext2fs *m_fs, int
return 0;
}
-
Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.137 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.138
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.137 Sun Mar 27 16:24:58 2022
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c Sat Aug 26 05:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vnops.c,v 1.137 2022/03/27 16:24:58 christos Exp $ */
+/* $NetBSD: ext2fs_vnops.c,v 1.138 2023/08/26 05:22:50 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.137 2022/03/27 16:24:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.138 2023/08/26 05:22:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -381,7 +381,7 @@ ext2fs_setattr(void *v)
(vap->va_flags & UF_IMMUTABLE) ? EXT2_IMMUTABLE : 0;
#endif
ip->i_e2fs_flags |=
- (vap->va_flags & UF_NODUMP) ? EXT2_NODUMP : 0;
+ (vap->va_flags & UF_NODUMP) ? EXT2_NODUMP : 0;
ip->i_flag |= IN_CHANGE;
if (vap->va_flags & (IMMUTABLE | APPEND))
return 0;
