Merge branch 'next' into for-linus

[deliverable/linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 185836ba53ef6e23a63b6a0de7c22ebae19eac0b..993e6ba689ccd442aa33e42489e71f0e558d1943 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1013,7 +1013,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
                 */
                oldpage = newpage;
        } else {
-               mem_cgroup_migrate(oldpage, newpage, false);
+               mem_cgroup_migrate(oldpage, newpage, true);
                lru_cache_add_anon(newpage);
                *pagep = newpage;
        }
@@ -1536,7 +1536,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
         * holes of a sparse file, we actually need to allocate those pages,
         * and even mark them dirty, so it cannot exceed the max_blocks limit.
         */
-       if (segment_eq(get_fs(), KERNEL_DS))
+       if (!iter_is_iovec(to))
                sgp = SGP_DIRTY;
 
        index = *ppos >> PAGE_CACHE_SHIFT;