[GFS2] Fix up merge of Linus' kernel into GFS2