Module Name: src
Committed By: mlelstv
Date: Sun Apr 24 06:48:15 UTC 2022
Modified Files:
src/sys/lib/libsa: ext2fs.c minixfs3.c saioctl.h ufs.c
Log Message:
Ask driver about sector size to support reading superblocks from fixed
byte offsets.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libsa/minixfs3.c
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libsa/saioctl.h
cvs rdiff -u -r1.81 -r1.82 src/sys/lib/libsa/ufs.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/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.30 src/sys/lib/libsa/ext2fs.c:1.31
--- src/sys/lib/libsa/ext2fs.c:1.30 Tue Apr 19 09:25:38 2022
+++ src/sys/lib/libsa/ext2fs.c Sun Apr 24 06:48:15 2022
@@ -1,4 +1,4 @@
-/* $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.
@@ -415,9 +415,15 @@ read_sblock(struct open_file *f, struct
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;
Index: src/sys/lib/libsa/minixfs3.c
diff -u src/sys/lib/libsa/minixfs3.c:1.9 src/sys/lib/libsa/minixfs3.c:1.10
--- src/sys/lib/libsa/minixfs3.c:1.9 Tue Apr 19 09:25:38 2022
+++ src/sys/lib/libsa/minixfs3.c Sun Apr 24 06:48:15 2022
@@ -1,4 +1,4 @@
-/* $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
@@ -449,6 +449,7 @@ read_sblock(struct open_file *f, struct
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.
@@ -456,8 +457,13 @@ read_sblock(struct open_file *f, struct
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;
Index: src/sys/lib/libsa/saioctl.h
diff -u src/sys/lib/libsa/saioctl.h:1.4 src/sys/lib/libsa/saioctl.h:1.5
--- src/sys/lib/libsa/saioctl.h:1.4 Sun Dec 11 12:24:46 2005
+++ src/sys/lib/libsa/saioctl.h Sun Apr 24 06:48:15 2022
@@ -1,4 +1,4 @@
-/* $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
@@ -46,3 +46,5 @@
#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 */
Index: src/sys/lib/libsa/ufs.c
diff -u src/sys/lib/libsa/ufs.c:1.81 src/sys/lib/libsa/ufs.c:1.82
--- src/sys/lib/libsa/ufs.c:1.81 Tue Apr 19 09:25:38 2022
+++ src/sys/lib/libsa/ufs.c Sun Apr 24 06:48:15 2022
@@ -1,4 +1,4 @@
-/* $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
@@ -594,13 +594,21 @@ ffs_find_superblock(struct open_file *f,
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)
@@ -615,7 +623,7 @@ ffs_find_superblock(struct open_file *f,
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)
