diff options
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index f92fea94d037..1089092aecaf 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -936,7 +936,7 @@ found: | |||
| 936 | spin_lock(&info->lock); | 936 | spin_lock(&info->lock); |
| 937 | ptr = shmem_swp_entry(info, idx, NULL); | 937 | ptr = shmem_swp_entry(info, idx, NULL); |
| 938 | if (ptr && ptr->val == entry.val) { | 938 | if (ptr && ptr->val == entry.val) { |
| 939 | error = add_to_page_cache(page, inode->i_mapping, | 939 | error = add_to_page_cache_locked(page, inode->i_mapping, |
| 940 | idx, GFP_NOWAIT); | 940 | idx, GFP_NOWAIT); |
| 941 | /* does mem_cgroup_uncharge_cache_page on error */ | 941 | /* does mem_cgroup_uncharge_cache_page on error */ |
| 942 | } else /* we must compensate for our precharge above */ | 942 | } else /* we must compensate for our precharge above */ |
| @@ -1301,8 +1301,8 @@ repeat: | |||
| 1301 | SetPageUptodate(filepage); | 1301 | SetPageUptodate(filepage); |
| 1302 | set_page_dirty(filepage); | 1302 | set_page_dirty(filepage); |
| 1303 | swap_free(swap); | 1303 | swap_free(swap); |
| 1304 | } else if (!(error = add_to_page_cache( | 1304 | } else if (!(error = add_to_page_cache_locked(swappage, mapping, |
| 1305 | swappage, mapping, idx, GFP_NOWAIT))) { | 1305 | idx, GFP_NOWAIT))) { |
| 1306 | info->flags |= SHMEM_PAGEIN; | 1306 | info->flags |= SHMEM_PAGEIN; |
| 1307 | shmem_swp_set(info, entry, 0); | 1307 | shmem_swp_set(info, entry, 0); |
| 1308 | shmem_swp_unmap(entry); | 1308 | shmem_swp_unmap(entry); |