If in future mode code in fstrim.c will use or should use libmnt_context then I would do a rewrite to have clean code to work with in future. You can do 4. for backporting and then do 1. the new releases ... Just my 2 cents :-)