--- Revision 663639376333
+++ Revision 353336633239
@@ -18,7 +18,7 @@
 -       nolock = btrfs_is_free_space_inode(BTRFS_I(inode));
 +       if (btrfs_is_free_space_inode(BTRFS_I(inode))) {
 +               nolock = true;
-+       } else {
++       } else if (btrfs_test_opt(fs_info, FLUSHONCOMMIT)) {
 +               spin_lock(&fs_info->trans_lock);
 +               if (fs_info->running_transaction &&
 +                   (fs_info->running_transaction->state >=