Make the FsMagic compatible across different systems

Sorry for these repeated pulls. The btrfs support was broken because the master changed the variables. 

Thanks!