فهرست منبع

fix(susfs-patches): fix inotify_mark_user_mask insertion anchor

The previous sed looked for #ifdef CONFIG_KSU_SUSFS_SUS_MOUNT which
is only added by the real SUSFS patch (runs after fake patches).
Anchor on the original function signature instead:
static void inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)
TheWildJames 1 ماه پیش
والد
کامیت
d187b7c1a3
1فایلهای تغییر یافته به همراه1 افزوده شده و 1 حذف شده
  1. 1 1
      .github/actions/susfs-patches/action.yml

+ 1 - 1
.github/actions/susfs-patches/action.yml

@@ -68,7 +68,7 @@ runs:
           perl -i -pe 's/\bmask,\s*mark->ignored_mask/inotify_mark_user_mask(mark)/g' fs/notify/fdinfo.c
           perl -i -pe 's/ignored_mask:%x/ignored_mask:0/g' fs/notify/fdinfo.c
           echo "Adding inotify_mark_user_mask function definition"
-          sed -i '/^#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT$/{N;s/^#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT\nstatic void inotify_fdinfo(/static inline u32 inotify_mark_user_mask(struct fsnotify_mark *mark)\n{\n\treturn mark->mask & IN_ALL_EVENTS;\n}\n\n#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT\nstatic void inotify_fdinfo(/}' fs/notify/fdinfo.c
+          sed -i 's|^static void inotify_fdinfo(struct seq_file \*m, struct fsnotify_mark \*mark)$|static inline u32 inotify_mark_user_mask(struct fsnotify_mark *mark)\n{\n\treturn mark->mask & IN_ALL_EVENTS;\n}\n\n&|' fs/notify/fdinfo.c
         fi
         if [ "${{ inputs.sublevel }}" -ge "197" ]; then
           echo "Applying namespace.c Android 13 5.15 Fake Patch"