Merge tag 'xfs-5.4-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / fs / xfs / xfs_buf.c

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index ca0849043f542657a0a4d7f531cf3f564421b8c9..21c243622a79d238dc13578dd0c22c1386d46ee9 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -353,7 +353,8 @@ xfs_buf_allocate_memory(
         */
        size = BBTOB(bp->b_length);
        if (size < PAGE_SIZE) {
-               bp->b_addr = kmem_alloc(size, KM_NOFS);
+               int align_mask = xfs_buftarg_dma_alignment(bp->b_target);
+               bp->b_addr = kmem_alloc_io(size, align_mask, KM_NOFS);
                if (!bp->b_addr) {
                        /* low memory - use alloc_page loop instead */
                        goto use_alloc_page;
@@ -368,7 +369,7 @@ xfs_buf_allocate_memory(
                }
                bp->b_offset = offset_in_page(bp->b_addr);
                bp->b_pages = bp->b_page_array;
-               bp->b_pages[0] = virt_to_page(bp->b_addr);
+               bp->b_pages[0] = kmem_to_page(bp->b_addr);
                bp->b_page_count = 1;
                bp->b_flags |= _XBF_KMEM;
                return 0;
@@ -1741,7 +1742,7 @@ xfs_alloc_buftarg(
 {
        xfs_buftarg_t           *btp;
 
-       btp = kmem_zalloc(sizeof(*btp), KM_SLEEP | KM_NOFS);
+       btp = kmem_zalloc(sizeof(*btp), KM_NOFS);
 
        btp->bt_mount = mp;
        btp->bt_dev =  bdev->bd_dev;
@@ -2096,7 +2097,7 @@ xfs_verify_magic(
        int                     idx;
 
        idx = xfs_sb_version_hascrc(&mp->m_sb);
-       if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx])))
+       if (WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx]))
                return false;
        return dmagic == bp->b_ops->magic[idx];
 }
@@ -2114,7 +2115,7 @@ xfs_verify_magic16(
        int                     idx;
 
        idx = xfs_sb_version_hascrc(&mp->m_sb);
-       if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx])))
+       if (WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx]))
                return false;
        return dmagic == bp->b_ops->magic16[idx];
 }