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

kernel: address -Wunused-but-set-variable

Browse Source 
Signed-off-by: rsuntk <rsuntk@yukiprjkt.my.id>
This commit is contained in:
rsuntk
2025-08-23 13:59:15 +07:00
committed by ShirkNeko
parent d970e45f14
commit c58e557fcd
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/core_hook.c
View File

@@ -1150,17 +1150,14 @@ static bool should_umount(struct path *path)
} }
#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)
static void ksu_path_umount(const char *mnt, struct path *path, int flags) static int ksu_path_umount(struct path *path, int flags)
{ {
int ret = path_umount(path, flags); return path_umount(path, flags);
#ifdef CONFIG_KSU_DEBUG
pr_info("%s: path: %s ret: %d\n", __func__, mnt, ret);
#endif
} }
#define ksu_umount_mnt(mnt, path, flags) (ksu_path_umount(mnt, path, flags)) #define ksu_umount_mnt(__unused, path, flags) (ksu_path_umount(path, flags))
#else #else
// TODO: Search a way to make this works without set_fs functions // TODO: Search a way to make this works without set_fs functions
static void ksu_sys_umount(const char *mnt, int flags) static int ksu_sys_umount(const char *mnt, int flags)
{ {
char __user *usermnt = (char __user *)mnt; char __user *usermnt = (char __user *)mnt;
mm_segment_t old_fs; mm_segment_t old_fs;
@@ -1174,7 +1171,8 @@ static void ksu_sys_umount(const char *mnt, int flags)
ret = sys_umount(usermnt, flags); // cuz asmlinkage long sys##name ret = sys_umount(usermnt, flags); // cuz asmlinkage long sys##name
#endif #endif
set_fs(old_fs); set_fs(old_fs);
pr_info("%s: path: %s ret: %d\n", __func__, usermnt, ret); pr_info("%s was called, ret: %d\n", __func__, ret);
return ret;
} }
#define ksu_umount_mnt(mnt, __unused, flags) \ #define ksu_umount_mnt(mnt, __unused, flags) \
@@ -1192,6 +1190,7 @@ static void try_umount(const char *mnt, bool check_mnt, int flags)
#endif #endif
{ {
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;
@@ -1215,7 +1214,12 @@ static void try_umount(const char *mnt, bool check_mnt, int flags)
} }
#endif #endif
ksu_umount_mnt(mnt, &path, flags); ret = ksu_umount_mnt(mnt, &path, flags);
if (ret) {
#ifdef CONFIG_KSU_DEBUG
pr_info("%s: path: %s, ret: %d\n", __func__, mnt, ret);
#endif
}
} }
#ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT #ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT