These patches fix compile problems in the new (2.6.25) tree. I'll merge the block fixes in with my next batch submission, but they need to be appended to the current fred-pnfs-block branch for it to compile. Fred