• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · af36d15f
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: remove free-space-cache.c WARN during log replay
      Btrfs: sectorsize align offsets in fiemap
      Btrfs: clear pages dirty for io and set them extent mapped
      Btrfs: wait on caching if we're loading the free space cache
      Btrfs: prefix resize related printks with btrfs:
      btrfs: fix stat blocks accounting
      Btrfs: avoid unnecessary bitmap search for cluster setup
      Btrfs: fix to search one more bitmap for cluster setup
      btrfs: mirror_num should be int, not u64
      btrfs: Fix up 32/64-bit compatibility for new ioctls
      Btrfs: fix barrier flushes
      Btrfs: fix tree corruption after multi-thread snapshots and inode_cache flush
    af36d15f
disk-io.c 95.9 KB