 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs.c,v 1.30 2022/04/19 09:25:38 skrll Exp $	*/
+/*	$NetBSD: ext2fs.c,v 1.31 2022/04/24 06:48:15 mlelstv Exp $	*/
 /*
  * Copyright (c) 1997 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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.
+ *
 @@ -405,29 +405,35 @@ search_directory(const char *name, int l
+		}
 		fp->f_seekp += buf_size;
+	}
 	return ENOENT;
+}
 int
 read_sblock(struct open_file *f, struct m_ext2fs *fs)
+{
 	static uint8_t sbbuf[SBSIZE];
 	struct ext2fs ext2fs;
 	size_t buf_size;
 	int rc;
 	u_int secsize;
 	secsize = 0;
 	rc = DEV_IOCTL(f->f_dev)(f, SAIOSECSIZE, &secsize);
 	if (rc != 0 || secsize == 0)
 		secsize = DEV_BSIZE;
 	rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ,
-	    SBOFF / DEV_BSIZE, SBSIZE, sbbuf, &buf_size);
+	    SBOFF / secsize, SBSIZE, sbbuf, &buf_size);
 	if (rc)
 		return rc;
 	if (buf_size != SBSIZE)
 		return EIO;
 	e2fs_sbload((void *)sbbuf, &ext2fs);
 	if (ext2fs.e2fs_magic != E2FS_MAGIC)
 		return EINVAL;
 	if (ext2fs.e2fs_rev > E2FS_REV1 ||
 	    (ext2fs.e2fs_rev == E2FS_REV1 &&
 	     (ext2fs.e2fs_first_ino != EXT2_FIRSTINO ||
 	     (ext2fs.e2fs_inode_size != 128 && ext2fs.e2fs_inode_size != 256) ||

 @@ -1,14 +1,14 @@
-/*	$NetBSD: minixfs3.c,v 1.9 2022/04/19 09:25:38 skrll Exp $	*/
+/*	$NetBSD: minixfs3.c,v 1.10 2022/04/24 06:48:15 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2012
  *	Vrije Universiteit, Amsterdam, The Netherlands. All rights reserved.
+ *
  * Author: Evgeniy Ivanov (based on libsa/ext2fs.c).
+ *
  * This code is derived from src/sys/lib/libsa/ext2fs.c contributed to
  * The NetBSD Foundation, see copyrights below.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -439,35 +439,41 @@ search_directory(const char *name, int l
+			}
+		}
 		fp->f_seekp += buf_size;
+	}
 	return ENOENT;
+}
 int
 read_sblock(struct open_file *f, struct mfs_sblock *fs)
+{
 	static uint8_t sbbuf[MINBSIZE];
 	size_t buf_size;
 	int rc;
 	u_int secsize;
 	/* We must read amount multiple of sector size, hence we can't
 	 * read SBSIZE and read MINBSIZE.
 	 */
 	if (SBSIZE > MINBSIZE)
 		return EINVAL;
 	secsize = 0;
 	rc = DEV_IOCTL(f->f_dev)(f, SAIOSECSIZE, &secsize);
 	if (rc != 0 || secsize == 0)
 		secsize = DEV_BSIZE;
 	rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ,
-	    SUPER_BLOCK_OFF / DEV_BSIZE, MINBSIZE, sbbuf, &buf_size);
+	    SUPER_BLOCK_OFF / secsize, MINBSIZE, sbbuf, &buf_size);
 	if (rc)
 		return rc;
 	if (buf_size != MINBSIZE)
 		return EIO;
 	mfs_sbload((void *)sbbuf, fs);
 	if (fs->mfs_magic != SUPER_MAGIC)
 		return EINVAL;
 	if (fs->mfs_block_size < MINBSIZE)
 		return EINVAL;
 	if ((fs->mfs_block_size % 512) != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: saioctl.h,v 1.4 2005/12/11 12:24:46 christos Exp $	*/
+/*	$NetBSD: saioctl.h,v 1.5 2022/04/24 06:48:15 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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.
 @@ -36,13 +36,15 @@
 #define	SAIOCHECK	(('d'<<8)|2)	/* next i/o checks data */
 #define	SAIOHCHECK	(('d'<<8)|3)	/* next i/o checks header & data */
 #define	SAIONOBAD	(('d'<<8)|4)	/* inhibit bad sector forwarding */
 #define	SAIODOBAD	(('d'<<8)|5)	/* enable bad sector forwarding */
 #define	SAIOECCLIM	(('d'<<8)|6)	/* set limit to ecc correction, bits */
 #define	SAIOECCUNL	(('d'<<8)|7)	/* use standard ecc procedures */
 #define	SAIORETRIES	(('d'<<8)|8)	/* set retry count for unit */
 #define	SAIODEVDATA	(('d'<<8)|9)	/* get pointer to pack label */
 #define	SAIOSSI		(('d'<<8)|10)	/* set skip sector inhibit */
 #define	SAIONOSSI	(('d'<<8)|11)	/* inhibit skip sector handling */
 #define	SAIOSSDEV	(('d'<<8)|12)	/* is device skip sector type? */
 #define	SAIODEBUG	(('d'<<8)|13)	/* enable/disable debugging */
 #define	SAIOGBADINFO	(('d'<<8)|14)	/* get bad-sector table */
 #define SAIOSECSIZE	(('d'<<8)|15)	/* get sector size */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs.c,v 1.81 2022/04/19 09:25:38 skrll Exp $	*/
+/*	$NetBSD: ufs.c,v 1.82 2022/04/24 06:48:15 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -584,48 +584,56 @@ search_directory(const char *name, int l
+			}
+		}
 		fp->f_seekp += buf_size;
+	}
 	return ENOENT;
+}
 static __inline__ int
 ffs_find_superblock(struct open_file *f, FS *fs)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	int rc;
 	size_t buf_size;
 	u_int secsize;
 #ifdef LIBSA_FFSv2
 	static daddr_t sblock_try[] = SBLOCKSEARCH;
 	int i;
 #endif
 	secsize = 0;
 	rc = DEV_IOCTL(f->f_dev)(f, SAIOSECSIZE, &secsize);
 	if (rc != 0 || secsize == 0)
 		secsize = DEV_BSIZE;
 #ifdef LIBSA_FFSv2
 	for (i = 0; sblock_try[i] != -1; i++) {
 		rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ,
-		    sblock_try[i] / DEV_BSIZE, SBLOCKSIZE, fs, &buf_size);
+		    sblock_try[i] / secsize, SBLOCKSIZE, fs, &buf_size);
 		if (rc)
 			return rc;
 		if (buf_size != SBLOCKSIZE)
 			return EINVAL;
 		ffs_fix_magic_swapped(fp, fs);
 		if (fs->fs_sblockloc != sblock_try[i])
 			/* an alternate superblock - try again */
 			continue;
 		if (ffs_is_magic(fs))
 			return 0;
+	}
 	return EINVAL;
 #else /* LIBSA_FFSv2 */
 	rc = DEV_STRATEGY(f->f_dev)(f->f_devdata, F_READ,
-		SBLOCKOFFSET / DEV_BSIZE, SBLOCKSIZE, fs, &buf_size);
+		SBLOCKOFFSET / secsize, SBLOCKSIZE, fs, &buf_size);
 	if (rc)
 		return rc;
 	if (buf_size != SBLOCKSIZE)
 		return EINVAL;
 	ffs_fix_magic_swapped(fp, fs);
 #ifdef LIBSA_LFS
 	if (fs->lfs_version != REQUIRED_LFS_VERSION)
 		return EINVAL;
 #endif
 	if (!ffs_is_magic(fs))
 		return EINVAL;