Merge tag 'arm-soc/for-5.5/devicetree-part2' of https://github.com/Broadcom/stblinux...

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

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 0abba171aa89b6c948fc795201d2eee9734d6e06..a0229c368e789e5b8e7e8607d9b932e7d9e05446 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -238,7 +238,7 @@ _xfs_buf_alloc(
         */
        error = xfs_buf_get_maps(bp, nmaps);
        if (error)  {
-               kmem_zone_free(xfs_buf_zone, bp);
+               kmem_cache_free(xfs_buf_zone, bp);
                return NULL;
        }
 
@@ -304,7 +304,7 @@ _xfs_buf_free_pages(
  *     The buffer must not be on any hash - use xfs_buf_rele instead for
  *     hashed and refcounted buffers
  */
-void
+static void
 xfs_buf_free(
        xfs_buf_t               *bp)
 {
@@ -328,7 +328,7 @@ xfs_buf_free(
                kmem_free(bp->b_addr);
        _xfs_buf_free_pages(bp);
        xfs_buf_free_maps(bp);
-       kmem_zone_free(xfs_buf_zone, bp);
+       kmem_cache_free(xfs_buf_zone, bp);
 }
 
 /*
@@ -461,7 +461,7 @@ _xfs_buf_map_pages(
                unsigned nofs_flag;
 
                /*
-                * vm_map_ram() will allocate auxillary structures (e.g.
+                * vm_map_ram() will allocate auxiliary structures (e.g.
                 * pagetables) with GFP_KERNEL, yet we are likely to be under
                 * GFP_NOFS context here. Hence we need to tell memory reclaim
                 * that we are in such a context via PF_MEMALLOC_NOFS to prevent
@@ -949,7 +949,7 @@ xfs_buf_get_uncached(
        _xfs_buf_free_pages(bp);
  fail_free_buf:
        xfs_buf_free_maps(bp);
-       kmem_zone_free(xfs_buf_zone, bp);
+       kmem_cache_free(xfs_buf_zone, bp);
  fail:
        return NULL;
 }
@@ -1261,8 +1261,7 @@ xfs_buf_ioapply_map(
        int             map,
        int             *buf_offset,
        int             *count,
-       int             op,
-       int             op_flags)
+       int             op)
 {
        int             page_index;
        int             total_nr_pages = bp->b_page_count;
@@ -1297,7 +1296,7 @@ xfs_buf_ioapply_map(
        bio->bi_iter.bi_sector = sector;
        bio->bi_end_io = xfs_buf_bio_end_io;
        bio->bi_private = bp;
-       bio_set_op_attrs(bio, op, op_flags);
+       bio->bi_opf = op;
 
        for (; size && nr_pages; nr_pages--, page_index++) {
                int     rbytes, nbytes = PAGE_SIZE - offset;
@@ -1342,7 +1341,6 @@ _xfs_buf_ioapply(
 {
        struct blk_plug plug;
        int             op;
-       int             op_flags = 0;
        int             offset;
        int             size;
        int             i;
@@ -1384,15 +1382,14 @@ _xfs_buf_ioapply(
                                dump_stack();
                        }
                }
-       } else if (bp->b_flags & XBF_READ_AHEAD) {
-               op = REQ_OP_READ;
-               op_flags = REQ_RAHEAD;
        } else {
                op = REQ_OP_READ;
+               if (bp->b_flags & XBF_READ_AHEAD)
+                       op |= REQ_RAHEAD;
        }
 
        /* we only use the buffer cache for meta-data */
-       op_flags |= REQ_META;
+       op |= REQ_META;
 
        /*
         * Walk all the vectors issuing IO on them. Set up the initial offset
@@ -1404,7 +1401,7 @@ _xfs_buf_ioapply(
        size = BBTOB(bp->b_length);
        blk_start_plug(&plug);
        for (i = 0; i < bp->b_map_count; i++) {
-               xfs_buf_ioapply_map(bp, i, &offset, &size, op, op_flags);
+               xfs_buf_ioapply_map(bp, i, &offset, &size, op);
                if (bp->b_error)
                        break;
                if (size <= 0)
@@ -2063,8 +2060,9 @@ xfs_buf_delwri_pushbuf(
 int __init
 xfs_buf_init(void)
 {
-       xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf",
-                                               KM_ZONE_HWALIGN, NULL);
+       xfs_buf_zone = kmem_cache_create("xfs_buf",
+                                        sizeof(struct xfs_buf), 0,
+                                        SLAB_HWCACHE_ALIGN, NULL);
        if (!xfs_buf_zone)
                goto out;
 
@@ -2077,7 +2075,7 @@ xfs_buf_init(void)
 void
 xfs_buf_terminate(void)
 {
-       kmem_zone_destroy(xfs_buf_zone);
+       kmem_cache_destroy(xfs_buf_zone);
 }
 
 void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)