]> Git Repo - J-linux.git/commitdiff
Merge tag 'for-5.14-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <[email protected]>
Fri, 30 Jul 2021 17:50:09 +0000 (10:50 -0700)
committerLinus Torvalds <[email protected]>
Fri, 30 Jul 2021 17:50:09 +0000 (10:50 -0700)
Pull btrfs fixes from David Sterba:

 - fix -Warray-bounds warning, to help external patchset to make it
   default treewide

 - fix writeable device accounting (syzbot report)

 - fix fsync and log replay after a rename and inode eviction

 - fix potentially lost error code when submitting multiple bios for
   compressed range

* tag 'for-5.14-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: calculate number of eb pages properly in csum_tree_block
  btrfs: fix rw device counting in __btrfs_free_extra_devids
  btrfs: fix lost inode on log replay after mix of fsync, rename and inode eviction
  btrfs: mark compressed range uptodate only if all bio succeed

1  2 
fs/btrfs/volumes.c

diff --combined fs/btrfs/volumes.c
index 1e4d43ffe38b33a0d24dbe2583d6f8cdb48c71c3,4c83256ae37fb5931b68fcc5e977596bfe231709..70f94b75f25a69c6e1189552e2fec8e9c2134528
@@@ -1078,6 -1078,7 +1078,7 @@@ static void __btrfs_free_extra_devids(s
                if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state)) {
                        list_del_init(&device->dev_alloc_list);
                        clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
+                       fs_devices->rw_devices--;
                }
                list_del_init(&device->dev_list);
                fs_devices->num_devices--;
@@@ -1247,7 -1248,7 +1248,7 @@@ int btrfs_open_devices(struct btrfs_fs_
        lockdep_assert_held(&uuid_mutex);
        /*
         * The device_list_mutex cannot be taken here in case opening the
 -       * underlying device takes further locks like bd_mutex.
 +       * underlying device takes further locks like open_mutex.
         *
         * We also don't need the lock here as this is called during mount and
         * exclusion is provided by uuid_mutex
This page took 0.0518150000000001 seconds and 4 git commands to generate.