Merge "misc: fix resource leak in populate_fs"