mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton: - various misc bits - DAX updates - OCFS2 - most of MM * emailed patches from Andrew Morton <[email protected]>: (119 commits) mm,fork: introduce MADV_WIPEONFORK x86,mpx: make mpx depend on x86-64 to free up VMA flag mm: add /proc/pid/smaps_rollup mm: hugetlb: clear target sub-page last when clearing huge page mm: oom: let oom_reap_task and exit_mmap run concurrently swap: choose swap device according to numa node mm: replace TIF_MEMDIE checks by tsk_is_oom_victim mm, oom: do not rely on TIF_MEMDIE for memory reserves access z3fold: use per-cpu unbuddied lists mm, swap: don't use VMA based swap readahead if HDD is used as swap mm, swap: add sysfs interface for VMA based swap readahead mm, swap: VMA based swap readahead mm, swap: fix swap readahead marking mm, swap: add swap readahead hit statistics mm/vmalloc.c: don't reinvent the wheel but use existing llist API mm/vmstat.c: fix wrong comment selftests/memfd: add memfd_create hugetlbfs selftest mm/shmem: add hugetlbfs support to memfd_create() mm, devm_memremap_pages: use multi-order radix for ZONE_DEVICE lookups mm/vmalloc.c: halve the number of comparisons performed in pcpu_get_vm_areas() ...
This commit is contained in:
commit
d34fc1adf0
139 changed files with 3960 additions and 2068 deletions
|
|
@ -194,36 +194,6 @@ static enum fscache_checkaux ceph_fscache_inode_check_aux(
|
|||
return FSCACHE_CHECKAUX_OKAY;
|
||||
}
|
||||
|
||||
static void ceph_fscache_inode_now_uncached(void* cookie_netfs_data)
|
||||
{
|
||||
struct ceph_inode_info* ci = cookie_netfs_data;
|
||||
struct pagevec pvec;
|
||||
pgoff_t first;
|
||||
int loop, nr_pages;
|
||||
|
||||
pagevec_init(&pvec, 0);
|
||||
first = 0;
|
||||
|
||||
dout("ceph inode 0x%p now uncached", ci);
|
||||
|
||||
while (1) {
|
||||
nr_pages = pagevec_lookup(&pvec, ci->vfs_inode.i_mapping, first,
|
||||
PAGEVEC_SIZE - pagevec_count(&pvec));
|
||||
|
||||
if (!nr_pages)
|
||||
break;
|
||||
|
||||
for (loop = 0; loop < nr_pages; loop++)
|
||||
ClearPageFsCache(pvec.pages[loop]);
|
||||
|
||||
first = pvec.pages[nr_pages - 1]->index + 1;
|
||||
|
||||
pvec.nr = nr_pages;
|
||||
pagevec_release(&pvec);
|
||||
cond_resched();
|
||||
}
|
||||
}
|
||||
|
||||
static const struct fscache_cookie_def ceph_fscache_inode_object_def = {
|
||||
.name = "CEPH.inode",
|
||||
.type = FSCACHE_COOKIE_TYPE_DATAFILE,
|
||||
|
|
@ -231,7 +201,6 @@ static const struct fscache_cookie_def ceph_fscache_inode_object_def = {
|
|||
.get_attr = ceph_fscache_inode_get_attr,
|
||||
.get_aux = ceph_fscache_inode_get_aux,
|
||||
.check_aux = ceph_fscache_inode_check_aux,
|
||||
.now_uncached = ceph_fscache_inode_now_uncached,
|
||||
};
|
||||
|
||||
void ceph_fscache_register_inode_cookie(struct inode *inode)
|
||||
|
|
|
|||
Loading…
Reference in a new issue