Merge drm/drm-next into drm-misc-next

[platform/kernel/linux-rpi.git] / fs / hfsplus / bitmap.c

diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c
index cebce0c..bd8dcea 100644 (file)
--- a/fs/hfsplus/bitmap.c
+++ b/fs/hfsplus/bitmap.c
@@ -39,7 +39,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
                start = size;
                goto out;
        }
-       pptr = kmap(page);
+       pptr = kmap_local_page(page);
        curr = pptr + (offset & (PAGE_CACHE_BITS - 1)) / 32;
        i = offset % 32;
        offset &= ~(PAGE_CACHE_BITS - 1);
@@ -74,7 +74,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
                        }
                        curr++;
                }
-               kunmap(page);
+               kunmap_local(pptr);
                offset += PAGE_CACHE_BITS;
                if (offset >= size)
                        break;
@@ -84,7 +84,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
                        start = size;
                        goto out;
                }
-               curr = pptr = kmap(page);
+               curr = pptr = kmap_local_page(page);
                if ((size ^ offset) / PAGE_CACHE_BITS)
                        end = pptr + PAGE_CACHE_BITS / 32;
                else
@@ -127,7 +127,7 @@ found:
                        len -= 32;
                }
                set_page_dirty(page);
-               kunmap(page);
+               kunmap_local(pptr);
                offset += PAGE_CACHE_BITS;
                page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS,
                                         NULL);
@@ -135,7 +135,7 @@ found:
                        start = size;
                        goto out;
                }
-               pptr = kmap(page);
+               pptr = kmap_local_page(page);
                curr = pptr;
                end = pptr + PAGE_CACHE_BITS / 32;
        }
@@ -151,7 +151,7 @@ last:
 done:
        *curr = cpu_to_be32(n);
        set_page_dirty(page);
-       kunmap(page);
+       kunmap_local(pptr);
        *max = offset + (curr - pptr) * 32 + i - start;
        sbi->free_blocks -= *max;
        hfsplus_mark_mdb_dirty(sb);
@@ -185,7 +185,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
        page = read_mapping_page(mapping, pnr, NULL);
        if (IS_ERR(page))
                goto kaboom;
-       pptr = kmap(page);
+       pptr = kmap_local_page(page);
        curr = pptr + (offset & (PAGE_CACHE_BITS - 1)) / 32;
        end = pptr + PAGE_CACHE_BITS / 32;
        len = count;
@@ -215,11 +215,11 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
                if (!count)
                        break;
                set_page_dirty(page);
-               kunmap(page);
+               kunmap_local(pptr);
                page = read_mapping_page(mapping, ++pnr, NULL);
                if (IS_ERR(page))
                        goto kaboom;
-               pptr = kmap(page);
+               pptr = kmap_local_page(page);
                curr = pptr;
                end = pptr + PAGE_CACHE_BITS / 32;
        }
@@ -231,7 +231,7 @@ done:
        }
 out:
        set_page_dirty(page);
-       kunmap(page);
+       kunmap_local(pptr);
        sbi->free_blocks += len;
        hfsplus_mark_mdb_dirty(sb);
        mutex_unlock(&sbi->alloc_mutex);