I think we should leave this code unmodified (at least for style issues).  It's a hack of upstream fsx.c to use librbd, and the closer it is to the original, the easier it will be to forward port our changes to future versions.