Fix multiple issues in Core ZFS Logic (#21)

alek-p · alek-p · commit 9e01d56c6cbf · 2026-01-12T10:02:00.000-05:00
- Fix RAID-Z expansion progress reporting > 100% (openzfs#18103). - Rename getextmntent to zfs_getextmntent to avoid libc conflict (openzfs#17887). - Fix Project Quota initialization on upgrade (openzfs#17955, openzfs#17999) by refreshing dnode initialization when feature is enabled.
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
@@ -7650,7 +7650,7 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
 	 * Search for the given (major,minor) pair in the mount table.
 	 */
 
-	if (getextmntent(path, &entry, &statbuf) != 0) {
+	if (zfs_getextmntent(path, &entry, &statbuf) != 0) {
 		if (op == OP_SHARE) {
 			(void) fprintf(stderr, gettext("cannot %s '%s': not "
 			    "currently mounted\n"), cmdname, path);
diff --git a/cmd/zinject/translate.c b/cmd/zinject/translate.c
@@ -98,7 +98,7 @@ parse_pathname(const char *inpath, char *dataset, char *relpath,
 		return (-1);
 	}
 
-	if (getextmntent(fullpath, &mp, statbuf) != 0) {
+	if (zfs_getextmntent(fullpath, &mp, statbuf) != 0) {
 		(void) fprintf(stderr, "cannot find mountpoint for '%s'\n",
 		    fullpath);
 		return (-1);
diff --git a/lib/libspl/include/os/freebsd/sys/mnttab.h b/lib/libspl/include/os/freebsd/sys/mnttab.h
@@ -77,7 +77,7 @@ struct statfs;
 
 extern int getmntany(FILE *fp, struct mnttab *mp, struct mnttab *mpref);
 extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
-extern int getextmntent(const char *path, struct extmnttab *entry,
+extern int zfs_getextmntent(const char *path, struct extmnttab *entry,
     struct stat64 *statbuf);
 extern void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
 extern char *hasmntopt(struct mnttab *mnt, const char *opt);
diff --git a/lib/libspl/include/os/linux/sys/mnttab.h b/lib/libspl/include/os/linux/sys/mnttab.h
@@ -73,7 +73,7 @@ struct statfs;
 
 extern int getmntany(FILE *fp, struct mnttab *mp, struct mnttab *mpref);
 extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
-extern int getextmntent(const char *path, struct extmnttab *mp,
+extern int zfs_getextmntent(const char *path, struct extmnttab *mp,
     struct stat64 *statbuf);
 static inline char *_sol_hasmntopt(struct mnttab *mnt, const char *opt)
 {
diff --git a/lib/libspl/os/freebsd/getmntany.c b/lib/libspl/os/freebsd/getmntany.c
@@ -40,7 +40,7 @@
 #include <libzutil.h>
 
 int
-getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
+zfs_getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
 {
 	struct statfs sfs;
 
diff --git a/lib/libspl/os/linux/getmntany.c b/lib/libspl/os/linux/getmntany.c
@@ -113,7 +113,7 @@ getextmntent_impl(FILE *fp, struct extmnttab *mp, uint64_t *mnt_id)
 }
 
 int
-getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
+zfs_getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
 {
 	struct stat64 st;
 	FILE *fp;
diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
@@ -203,7 +203,7 @@
     <elf-symbol name='get_system_hostid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='get_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getexecname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zfs_getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getmntany' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getprop_uint64' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getzoneid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -8681,7 +8681,7 @@
       <parameter type-id='c19b74c3'/>
       <return type-id='c19b74c3'/>
     </function-decl>
-    <function-decl name='getextmntent' mangled-name='getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
+    <function-decl name='zfs_getextmntent' mangled-name='zfs_getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_getextmntent'>
       <parameter type-id='80f4b756'/>
       <parameter type-id='394fc496'/>
       <parameter type-id='62f7a03d'/>
diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
@@ -1180,7 +1180,7 @@ zfs_path_to_zhandle(libzfs_handle_t *hdl, const char *path, zfs_type_t argtype)
 		return (zfs_open(hdl, path, argtype));
 	}
 
-	if (getextmntent(path, &entry, &statbuf) != 0)
+	if (zfs_getextmntent(path, &entry, &statbuf) != 0)
 		return (NULL);
 
 	if (strcmp(entry.mnt_fstype, MNTTYPE_ZFS) != 0) {
diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi
@@ -146,7 +146,7 @@
     <elf-symbol name='get_system_hostid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='get_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getexecname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='zfs_getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getmntany' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getzoneid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='kmem_asprintf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1629,7 +1629,7 @@
       <parameter type-id='9d424d31' name='mgetp'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='getextmntent' mangled-name='getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
+    <function-decl name='zfs_getextmntent' mangled-name='zfs_getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_getextmntent'>
       <parameter type-id='80f4b756' name='path'/>
       <parameter type-id='394fc496' name='entry'/>
       <parameter type-id='62f7a03d' name='statbuf'/>
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
@@ -2397,11 +2397,40 @@ dmu_objset_userspace_upgrade(objset_t *os)
 	dmu_objset_upgrade(os, dmu_objset_userspace_upgrade_cb);
 }
 
+static void
+dmu_objset_refresh_projectquota(objset_t *os)
+{
+	if (!spa_feature_is_enabled(os->os_spa, SPA_FEATURE_PROJECT_QUOTA))
+		return;
+
+	if (DMU_PROJECTUSED_DNODE(os) != NULL)
+		return;
+
+	int size = sizeof (objset_phys_t);
+	if (arc_buf_size(os->os_phys_buf) < size) {
+		arc_buf_t *buf = arc_alloc_buf(os->os_spa, &os->os_phys_buf,
+		    ARC_BUFC_METADATA, size);
+		memset(buf->b_data, 0, size);
+		memcpy(buf->b_data, os->os_phys_buf->b_data,
+		    arc_buf_size(os->os_phys_buf));
+		arc_buf_destroy(os->os_phys_buf, &os->os_phys_buf);
+		os->os_phys_buf = buf;
+		os->os_phys = os->os_phys_buf->b_data;
+	}
+
+	if (OBJSET_BUF_HAS_PROJECTUSED(os->os_phys_buf)) {
+		dnode_special_open(os, &os->os_phys->os_projectused_dnode,
+		    DMU_PROJECTUSED_OBJECT, &os->os_projectused_dnode);
+	}
+}
+
 static int
 dmu_objset_id_quota_upgrade_cb(objset_t *os)
 {
 	int err = 0;
 
+	dmu_objset_refresh_projectquota(os);
+
 	if (dmu_objset_userobjspace_present(os) &&
 	    dmu_objset_projectquota_present(os))
 		return (0);
diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
@@ -5258,6 +5258,9 @@ spa_raidz_expand_get_stats(spa_t *spa, pool_raidz_expand_stat_t *pres)
 		pres->pres_reflowed += vre->vre_bytes_copied_pertxg[i];
 	mutex_exit(&vre->vre_lock);
 
+	if (pres->pres_reflowed > pres->pres_to_reflow)
+		pres->pres_to_reflow = pres->pres_reflowed;
+
 	pres->pres_start_time = vre->vre_start_time;
 	pres->pres_end_time = vre->vre_end_time;
 	pres->pres_waiting_for_resilver = vre->vre_waiting_for_resilver;

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ parse_pathname(const char inpath, char dataset, char *relpath,`
`98`	`98`	`return (-1);`
`99`	`99`	`}`
`100`	`100`
`101`		`- if (getextmntent(fullpath, &mp, statbuf) != 0) {`
	`101`	`+ if (zfs_getextmntent(fullpath, &mp, statbuf) != 0) {`
`102`	`102`	`(void) fprintf(stderr, "cannot find mountpoint for '%s'\n",`
`103`	`103`	`fullpath);`
`104`	`104`	`return (-1);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ struct statfs;`
`73`	`73`
`74`	`74`	`extern int getmntany(FILE fp, struct mnttab mp, struct mnttab *mpref);`
`75`	`75`	`extern int _sol_getmntent(FILE fp, struct mnttab mp);`
`76`		`-extern int getextmntent(const char path, struct extmnttab mp,`
	`76`	`+extern int zfs_getextmntent(const char path, struct extmnttab mp,`
`77`	`77`	`struct stat64 *statbuf);`
`78`	`78`	`static inline char _sol_hasmntopt(struct mnttab mnt, const char *opt)`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`#include <libzutil.h>`
`41`	`41`
`42`	`42`	`int`
`43`		`-getextmntent(const char path, struct extmnttab entry, struct stat64 *statbuf)`
	`43`	`+zfs_getextmntent(const char path, struct extmnttab entry, struct stat64 *statbuf)`
`44`	`44`	`{`
`45`	`45`	`struct statfs sfs;`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ getextmntent_impl(FILE fp, struct extmnttab mp, uint64_t *mnt_id)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`int`
`116`		`-getextmntent(const char path, struct extmnttab entry, struct stat64 *statbuf)`
	`116`	`+zfs_getextmntent(const char path, struct extmnttab entry, struct stat64 *statbuf)`
`117`	`117`	`{`
`118`	`118`	`struct stat64 st;`
`119`	`119`	`FILE *fp;`
Original file line number	Diff line number	Diff line change
`@@ -1180,7 +1180,7 @@ zfs_path_to_zhandle(libzfs_handle_t hdl, const char path, zfs_type_t argtype)`
`1180`	`1180`	`return (zfs_open(hdl, path, argtype));`
`1181`	`1181`	`}`
`1182`	`1182`
`1183`		`- if (getextmntent(path, &entry, &statbuf) != 0)`
	`1183`	`+ if (zfs_getextmntent(path, &entry, &statbuf) != 0)`
`1184`	`1184`	`return (NULL);`
`1185`	`1185`
`1186`	`1186`	`if (strcmp(entry.mnt_fstype, MNTTYPE_ZFS) != 0) {`