Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[muen/linux.git] / fs / btrfs / transaction.c
index a2d6f7bcef6cf39ccdc0664d5c1cce6ef4d0789d..74bc3338418be39badb2eb73160c20b3e2240c74 100644 (file)
@@ -1672,9 +1672,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;
 
@@ -1713,9 +1711,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);