zio_change_current_buffer: bugfix and internal change

It didn't put the buffer type after the switch. Now it does. Moreover
some internal change within this function

Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
Acked-by: Alessandro Rubini <rubini@gnudd.com>