Merge tag 'rpmsg-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-2.6-microblaze.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 479d1ce..02e62fc 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1038,7 +1038,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
                same_folio = lend < folio_pos(folio) + folio_size(folio);
                folio_mark_dirty(folio);
                if (!truncate_inode_partial_folio(folio, lstart, lend)) {
-                       start = folio->index + folio_nr_pages(folio);
+                       start = folio_next_index(folio);
                        if (same_folio)
                                end = folio->index;
                }
@@ -1720,7 +1720,7 @@ static int shmem_replace_folio(struct folio **foliop, gfp_t gfp,
        int error;
 
        old = *foliop;
-       entry = folio_swap_entry(old);
+       entry = old->swap;
        swap_index = swp_offset(entry);
        swap_mapping = swap_address_space(entry);
 
@@ -1741,7 +1741,7 @@ static int shmem_replace_folio(struct folio **foliop, gfp_t gfp,
        __folio_set_locked(new);
        __folio_set_swapbacked(new);
        folio_mark_uptodate(new);
-       folio_set_swap_entry(new, entry);
+       new->swap = entry;
        folio_set_swapcache(new);
 
        /*
@@ -1786,7 +1786,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index,
        swp_entry_t swapin_error;
        void *old;
 
-       swapin_error = make_swapin_error_entry();
+       swapin_error = make_poisoned_swp_entry();
        old = xa_cmpxchg_irq(&mapping->i_pages, index,
                             swp_to_radix_entry(swap),
                             swp_to_radix_entry(swapin_error), 0);
@@ -1827,7 +1827,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
        swap = radix_to_swp_entry(*foliop);
        *foliop = NULL;
 
-       if (is_swapin_error_entry(swap))
+       if (is_poisoned_swp_entry(swap))
                return -EIO;
 
        si = get_swap_device(swap);
@@ -1858,7 +1858,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
        /* We have to do this with folio locked to prevent races */
        folio_lock(folio);
        if (!folio_test_swapcache(folio) ||
-           folio_swap_entry(folio).val != swap.val ||
+           folio->swap.val != swap.val ||
            !shmem_confirm_swap(mapping, index, swap)) {
                error = -EEXIST;
                goto unlock;
@@ -4200,8 +4200,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
        struct mempolicy *mpol;
 
        if (sbinfo->max_blocks != shmem_default_max_blocks())
-               seq_printf(seq, ",size=%luk",
-                       sbinfo->max_blocks << (PAGE_SHIFT - 10));
+               seq_printf(seq, ",size=%luk", K(sbinfo->max_blocks));
        if (sbinfo->max_inodes != shmem_default_max_inodes())
                seq_printf(seq, ",nr_inodes=%lu", sbinfo->max_inodes);
        if (sbinfo->mode != (0777 | S_ISVTX))