This last patch removes the union, replacing it with s_fs_info.