android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: Use a better wrapper compatible with ksu_umount_mnt

Browse Source
This commit is contained in:
ShirkNeko
2025-11-18 20:23:31 +08:00
parent b686c81be4
commit 07e7d129a0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/kernel_umount.c
View File

@@ -65,7 +65,7 @@ extern void susfs_try_umount(void);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) || defined(KSU_HAS_PATH_UMOUNT) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) || defined(KSU_HAS_PATH_UMOUNT)
extern int path_umount(struct path *path, int flags); extern int path_umount(struct path *path, int flags);
static void ksu_umount_mnt(const char *__never_use_mnt, struct path *path, int flags) static void ksu_umount_mnt(struct path *path, int flags)
{ {
int err = path_umount(path, flags); int err = path_umount(path, flags);
if (err) { if (err) {
@@ -88,12 +88,12 @@ static void ksu_sys_umount(const char *mnt, int flags)
set_fs(old_fs); set_fs(old_fs);
} }
#define ksu_umount_mnt(mnt, __unused, flags) \ static void ksu_umount_mnt(struct path *path, int flags)
({ \ {
path_put(__unused); \ const char *mnt = path->dentry->d_iname;
ksu_sys_umount(mnt, flags); \ path_put(path);
}) ksu_sys_umount(mnt, flags);
}
#endif #endif
#ifndef CONFIG_KSU_SUSFS_TRY_UMOUNT #ifndef CONFIG_KSU_SUSFS_TRY_UMOUNT
@@ -103,7 +103,6 @@ void try_umount(const char *mnt, int flags)
#endif // #ifndef CONFIG_KSU_SUSFS_TRY_UMOUNT #endif // #ifndef CONFIG_KSU_SUSFS_TRY_UMOUNT
{ {
struct path path; struct path path;
int ret;
int err = kern_path(mnt, 0, &path); int err = kern_path(mnt, 0, &path);
if (err) { if (err) {
return; return;
@@ -121,7 +120,7 @@ void try_umount(const char *mnt, int flags)
} }
#endif // #if defined(CONFIG_KSU_SUSFS_TRY_UMOUNT) && defined(CONFIG_KSU_SUSFS_ENABLE_LOG) #endif // #if defined(CONFIG_KSU_SUSFS_TRY_UMOUNT) && defined(CONFIG_KSU_SUSFS_ENABLE_LOG)
ksu_umount_mnt(mnt, &path, flags); ksu_umount_mnt(&path, flags);
} }
#ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT #ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT