git: 128a1db806da - main - linux: improve FUSE support

[Edward Tomasz Napierala]

The branch main has been updated by trasz:

URL: https://cgit.FreeBSD.org/src/commit/?id=128a1db806daac088a79314cee060b8a204e8481

commit 128a1db806daac088a79314cee060b8a204e8481
Author:     Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-06-07 09:43:23 +0000
Commit:     Edward Tomasz Napierala <trasz at FreeBSD.org>
CommitDate: 2021-06-07 09:43:28 +0000

    linux: improve FUSE support
    
    This fixes a number of AppImages; tested with
    scribus-1.5.6.1-linux-x86_64.AppImage.
    
    Reported By:    @probonopd
    Reviewed By:    asomers, emaste
    Sponsored By:   EPSRC
    Differential Revision:  https://reviews.freebsd.org/D30606
---
 sys/compat/linux/linux_file.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index a6cf467d6219..a5ab3506767e 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1320,12 +1320,11 @@ linux_mount(struct thread *td, struct linux_mount_args *args)
 		strcpy(fstypename, "linprocfs");
 	} else if (strcmp(fstypename, "vfat") == 0) {
 		strcpy(fstypename, "msdosfs");
-	} else if (strcmp(fstypename, "fuse") == 0) {
+	} else if (strcmp(fstypename, "fuse") == 0 ||
+	    strncmp(fstypename, "fuse.", 5) == 0) {
 		char *fuse_options, *fuse_option, *fuse_name;
 
-		if (strcmp(mntfromname, "fuse") == 0)
-			strcpy(mntfromname, "/dev/fuse");
-
+		strcpy(mntfromname, "/dev/fuse");
 		strcpy(fstypename, "fusefs");
 		data = malloc(MNAMELEN, M_TEMP, M_WAITOK);
 		error = copyinstr(args->data, data, MNAMELEN - 1, NULL);