Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-bionic-kernel.git] / fs / btrfs / transaction.c

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 68ad89e237132c9e6b3bceed8ad0bba7d67357c6..8f259b3a66b366d6e90393d4b3f15e91d23fd2b0 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1640,9 +1640,7 @@ static void do_async_commit(struct work_struct *work)
         * Tell lockdep about it.
         */
        if (ac->newtrans->type & __TRANS_FREEZABLE)
-               rwsem_acquire_read(
-                    &ac->root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],
-                    0, 1, _THIS_IP_);
+               __sb_writers_acquired(ac->root->fs_info->sb, SB_FREEZE_FS);
 
        current->journal_info = ac->newtrans;
 
@@ -1681,9 +1679,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
         * async commit thread will be the one to unlock it.
         */
        if (ac->newtrans->type & __TRANS_FREEZABLE)
-               rwsem_release(
-                       &root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],
-                       1, _THIS_IP_);
+               __sb_writers_release(root->fs_info->sb, SB_FREEZE_FS);
 
        schedule_work(&ac->work);