c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-31 11:14:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

libspl/mnttab: remove getmntany()

Browse Source 
Only used for when the mount cache was disabled, but since its always
enabled now, we don't need it.

Sponsored-by: TrueNAS
Reviewed-by: Ameer Hamza <ahamza@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@truenas.com>
Closes #18296
This commit is contained in:
Rob Norris
2026-03-09 11:51:31 +11:00
committed by Brian Behlendorf
parent 143f410e99
commit f64f12079c
4 changed files with 1 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/include/os/freebsd/sys/mnttab.h
-1
View File
@@ -75,7 +75,6 @@ struct extmnttab {
struct stat64; struct stat64;
struct statfs; struct statfs;
extern int getmntany(FILE *fp, struct mnttab *mp, struct mnttab *mpref);
extern int _sol_getmntent(FILE *fp, struct mnttab *mp); extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
extern int getextmntent(const char *path, struct extmnttab *entry, extern int getextmntent(const char *path, struct extmnttab *entry,
struct stat64 *statbuf); struct stat64 *statbuf);
lib/libspl/include/os/linux/sys/mnttab.h
-1
View File
@@ -71,7 +71,6 @@ struct extmnttab {
struct statfs; struct statfs;
extern int getmntany(FILE *fp, struct mnttab *mp, struct mnttab *mpref);
extern int _sol_getmntent(FILE *fp, struct mnttab *mp); extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
extern int getextmntent(const char *path, struct extmnttab *mp, extern int getextmntent(const char *path, struct extmnttab *mp,
struct stat64 *statbuf); struct stat64 *statbuf);
lib/libspl/os/freebsd/mnttab.c
+1 -34
View File
@@ -26,8 +26,7 @@
*/ */
/* /*
* This file implements Solaris compatible getmntany() and hasmntopt() * This file implements Solaris compatible hasmntopt() functions.
* functions.
*/ */
#include <sys/param.h> #include <sys/param.h>
@@ -176,38 +175,6 @@ fail:
return (error); return (error);
} }
int
getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
{
int i, error;
error = statfs_init();
if (error != 0)
return (error);
(void) pthread_rwlock_rdlock(&gsfs_lock);
for (i = 0; i < allfs; i++) {
if (mrefp->mnt_special != NULL &&
strcmp(mrefp->mnt_special, gsfs[i].f_mntfromname) != 0) {
continue;
}
if (mrefp->mnt_mountp != NULL &&
strcmp(mrefp->mnt_mountp, gsfs[i].f_mntonname) != 0) {
continue;
}
if (mrefp->mnt_fstype != NULL &&
strcmp(mrefp->mnt_fstype, gsfs[i].f_fstypename) != 0) {
continue;
}
statfs2mnttab(&gsfs[i], mgetp);
(void) pthread_rwlock_unlock(&gsfs_lock);
return (0);
}
(void) pthread_rwlock_unlock(&gsfs_lock);
return (-1);
}
int int
getmntent(FILE *fp, struct mnttab *mp) getmntent(FILE *fp, struct mnttab *mp)
{ {
lib/libspl/os/linux/mnttab.c
-17
View File
@@ -45,23 +45,6 @@
static __thread char buf[BUFSIZE]; static __thread char buf[BUFSIZE];
#define DIFF(xx) ( \
(mrefp->xx != NULL) && \
(mgetp->xx == NULL || strcmp(mrefp->xx, mgetp->xx) != 0))
int
getmntany(FILE *fp, struct mnttab *mgetp, struct mnttab *mrefp)
{
int ret;
while (
((ret = _sol_getmntent(fp, mgetp)) == 0) && (
DIFF(mnt_special) || DIFF(mnt_mountp) ||
DIFF(mnt_fstype) || DIFF(mnt_mntopts))) { }
return (ret);
}
int int
_sol_getmntent(FILE *fp, struct mnttab *mgetp) _sol_getmntent(FILE *fp, struct mnttab *mgetp)
{ {