Merge branch 'akpm' (patches from Andrew) (f0395d5b) · Commits · 戴 / test

fs/hugetlbfs/inode.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -842,9 +842,12 @@ static int hugetlbfs_error_remove_page(struct address_space *mapping,
		struct page *page)
		{
		struct inode *inode = mapping->host;
		pgoff_t index = page->index;

		remove_huge_page(page);
		if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
		hugetlb_fix_reserve_counts(inode);

		return 0;
		}

fs/ocfs2/alloc.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -7304,13 +7304,24 @@ out:

		static int ocfs2_trim_extent(struct super_block *sb,
		struct ocfs2_group_desc *gd,
		u32 start, u32 count)
		u64 group, u32 start, u32 count)
		{
		u64 discard, bcount;
		struct ocfs2_super *osb = OCFS2_SB(sb);

		bcount = ocfs2_clusters_to_blocks(sb, count);
		discard = le64_to_cpu(gd->bg_blkno) +
		ocfs2_clusters_to_blocks(sb, start);
		discard = ocfs2_clusters_to_blocks(sb, start);

		/*
		* For the first cluster group, the gd->bg_blkno is not at the start
		* of the group, but at an offset from the start. If we add it while
		* calculating discard for first group, we will wrongly start fstrim a
		* few blocks after the desried start block and the range can cross
		* over into the next cluster group. So, add it only if this is not
		* the first cluster group.
		*/
		if (group != osb->first_cluster_group_blkno)
		discard += le64_to_cpu(gd->bg_blkno);

		trace_ocfs2_trim_extent(sb, (unsigned long long)discard, bcount);

		@@ -7318,7 +7329,7 @@ static int ocfs2_trim_extent(struct super_block *sb,
		}

		static int ocfs2_trim_group(struct super_block *sb,
		struct ocfs2_group_desc *gd,
		struct ocfs2_group_desc *gd, u64 group,
		u32 start, u32 max, u32 minbits)
		{
		int ret = 0, count = 0, next;
		@@ -7337,7 +7348,7 @@ static int ocfs2_trim_group(struct super_block *sb,
		next = ocfs2_find_next_bit(bitmap, max, start);

		if ((next - start) >= minbits) {
		ret = ocfs2_trim_extent(sb, gd,
		ret = ocfs2_trim_extent(sb, gd, group,
		start, next - start);
		if (ret < 0) {
		mlog_errno(ret);
		@@ -7435,7 +7446,8 @@ int ocfs2_trim_fs(struct super_block sb, struct fstrim_range range)
		}

		gd = (struct ocfs2_group_desc *)gd_bh->b_data;
		cnt = ocfs2_trim_group(sb, gd, first_bit, last_bit, minlen);
		cnt = ocfs2_trim_group(sb, gd, group,
		first_bit, last_bit, minlen);
		brelse(gd_bh);
		gd_bh = NULL;
		if (cnt < 0) {

fs/proc/task_mmu.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1311,13 +1311,15 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,
		pmd_t pmd = *pmdp;
		struct page *page = NULL;

		if ((vma->vm_flags & VM_SOFTDIRTY) \|\| pmd_soft_dirty(pmd))
		if (vma->vm_flags & VM_SOFTDIRTY)
		flags \|= PM_SOFT_DIRTY;

		if (pmd_present(pmd)) {
		page = pmd_page(pmd);

		flags \|= PM_PRESENT;
		if (pmd_soft_dirty(pmd))
		flags \|= PM_SOFT_DIRTY;
		if (pm->show_pfn)
		frame = pmd_pfn(pmd) +
		((addr & ~PMD_MASK) >> PAGE_SHIFT);
		@@ -1329,6 +1331,8 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,
		frame = swp_type(entry) \|
		(swp_offset(entry) << MAX_SWAPFILES_SHIFT);
		flags \|= PM_SWAP;
		if (pmd_swp_soft_dirty(pmd))
		flags \|= PM_SOFT_DIRTY;
		VM_BUG_ON(!is_pmd_migration_entry(pmd));
		page = migration_entry_to_page(entry);
		}

include/linux/swap.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,10 @@ struct swap_info_struct {
		* both locks need hold, hold swap_lock
		* first.
		*/
		spinlock_t cont_lock; /*
		* protect swap count continuation page
		* list.
		*/
		struct work_struct discard_work; /* discard worker */
		struct swap_cluster_list discard_clusters; /* discard clusters list */
		};

mm/huge_memory.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -941,6 +941,9 @@ int copy_huge_pmd(struct mm_struct dst_mm, struct mm_struct src_mm,
		pmd = pmd_swp_mksoft_dirty(pmd);
		set_pmd_at(src_mm, addr, src_pmd, pmd);
		}
		add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);
		atomic_long_inc(&dst_mm->nr_ptes);
		pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);
		set_pmd_at(dst_mm, addr, dst_pmd, pmd);
		ret = 0;
		goto out_unlock;

Admin message