[t3] Add discard option to /data mount options

Author: Tasssadar

multirom.c

@@ -873,7 +873,7 @@ int multirom_prep_android_mounts(struct multirom_rom *rom)
 
         if(img == 0)
         {
-            if(mount(from, to, "ext4", flags[img][i], "") < 0)
+            if(mount(from, to, "ext4", flags[img][i], "discard,nomblk_io_submit") < 0)
             {
                 ERROR("Failed to mount %s to %s (%d: %s)", from, to, errno, strerror(errno));
                 return -1;

trampoline/trampoline.c

@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
         mkdir(REALDATA, 0755);
         if (find_data_dev(data_dev) == 0 &&
             mount(data_dev, REALDATA, "ext4", MS_RELATIME | MS_NOATIME,
-            "user_xattr,acl,barrier=1,data=ordered") >= 0)
+            "user_xattr,acl,barrier=1,data=ordered,discard,nomblk_io_submit") >= 0)
         {
             run_multirom();
         }

version.h

@@ -1,5 +1,5 @@
 #ifndef VERSION_H
 #define VERSION_H
     #define VERSION_MULTIROM 10
-    #define VERSION_TRAMPOLINE 2
+    #define VERSION_TRAMPOLINE 3
 #endif