Bug#688336:

[Mike Mestnik]

The patches have changes that have nothing to do with btrfs, I'll
attempt to isolate these.