|
@@ -1029,6 +1029,9 @@ repeat:
|
|
|
goto failed;
|
|
|
}
|
|
|
|
|
|
+ if (page && sgp == SGP_WRITE)
|
|
|
+ mark_page_accessed(page);
|
|
|
+
|
|
|
/* fallocated page? */
|
|
|
if (page && !PageUptodate(page)) {
|
|
|
if (sgp != SGP_READ)
|
|
@@ -1110,6 +1113,9 @@ repeat:
|
|
|
shmem_recalc_inode(inode);
|
|
|
spin_unlock(&info->lock);
|
|
|
|
|
|
+ if (sgp == SGP_WRITE)
|
|
|
+ mark_page_accessed(page);
|
|
|
+
|
|
|
delete_from_swap_cache(page);
|
|
|
set_page_dirty(page);
|
|
|
swap_free(swap);
|
|
@@ -1136,6 +1142,9 @@ repeat:
|
|
|
|
|
|
__SetPageSwapBacked(page);
|
|
|
__set_page_locked(page);
|
|
|
+ if (sgp == SGP_WRITE)
|
|
|
+ init_page_accessed(page);
|
|
|
+
|
|
|
error = mem_cgroup_charge_file(page, current->mm,
|
|
|
gfp & GFP_RECLAIM_MASK);
|
|
|
if (error)
|
|
@@ -1412,13 +1421,9 @@ shmem_write_begin(struct file *file, struct address_space *mapping,
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
struct page **pagep, void **fsdata)
|
|
|
{
|
|
|
- int ret;
|
|
|
struct inode *inode = mapping->host;
|
|
|
pgoff_t index = pos >> PAGE_CACHE_SHIFT;
|
|
|
- ret = shmem_getpage(inode, index, pagep, SGP_WRITE, NULL);
|
|
|
- if (ret == 0 && *pagep)
|
|
|
- init_page_accessed(*pagep);
|
|
|
- return ret;
|
|
|
+ return shmem_getpage(inode, index, pagep, SGP_WRITE, NULL);
|
|
|
}
|
|
|
|
|
|
static int
|