Merge tag 'asoc-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.17

A few small driver specific fixes and a couple of error handling fixes
in the core.

1 files changed, 2 insertions, 12 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index d296efe2d3e7..1d1ba083ca6e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4093,18 +4093,8 @@ log_extents:
                 }
         }
 
-        write_lock(&em_tree->lock);
-        /*
-         * If we're doing a ranged fsync and there are still modified extents
-         * in the list, we must run on the next fsync call as it might cover
-         * those extents (a full fsync or an fsync for other range).
-         */
-        if (list_empty(&em_tree->modified_extents)) {
-                BTRFS_I(inode)->logged_trans = trans->transid;
-                BTRFS_I(inode)->last_log_commit =
-                        BTRFS_I(inode)->last_sub_trans;
-        }
-        write_unlock(&em_tree->lock);
+        BTRFS_I(inode)->logged_trans = trans->transid;
+        BTRFS_I(inode)->last_log_commit = BTRFS_I(inode)->last_sub_trans;
 out_unlock:
         if (unlikely(err))
                 btrfs_put_logged_extents(&logged_list);