Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb11e65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Six fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock
  reiserfs: fix dereference of ERR_PTR
  ratelimit: fix bug in time interval by resetting right begin time
  mm: fix kernel crash in khugepaged thread
  mm: fix mlock accouting
  thp: change pmd_trans_huge_lock() interface to return ptl
parents 3e1e21c7 b1b1e15e

fs/ocfs2/dlmglue.c

+6 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,7 @@ static int __ocfs2_cluster_lock(struct ocfs2_super *osb, 
	unsigned int gen;

	int noqueue_attempted = 0;

	int dlm_locked = 0;

	int kick_dc = 0;



	if (!(lockres->l_flags & OCFS2_LOCK_INITIALIZED)) {

		mlog_errno(-EINVAL);
@@ -1524,7 +1525,12 @@ static int __ocfs2_cluster_lock(struct ocfs2_super *osb, 
unlock:

	lockres_clear_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING);



	/* ocfs2_unblock_lock reques on seeing OCFS2_LOCK_UPCONVERT_FINISHING */

	kick_dc = (lockres->l_flags & OCFS2_LOCK_BLOCKED);



	spin_unlock_irqrestore(&lockres->l_lock, flags);

	if (kick_dc)

		ocfs2_wake_downconvert_thread(osb);

out:

	/*

	 * This is helping work around a lock inversion between the page lock

fs/proc/task_mmu.c

+8 −4
Original line number Diff line number Diff line
@@ -602,7 +602,8 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
	pte_t *pte;

	spinlock_t *ptl;



	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

	ptl = pmd_trans_huge_lock(pmd, vma);

	if (ptl) {

		smaps_pmd_entry(pmd, addr, walk);

		spin_unlock(ptl);

		return 0;
@@ -913,7 +914,8 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, 
	spinlock_t *ptl;

	struct page *page;



	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

	ptl = pmd_trans_huge_lock(pmd, vma);

	if (ptl) {

		if (cp->type == CLEAR_REFS_SOFT_DIRTY) {

			clear_soft_dirty_pmd(vma, addr, pmd);

			goto out;
@@ -1187,7 +1189,8 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end, 
	int err = 0;



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	if (pmd_trans_huge_lock(pmdp, vma, &ptl)) {

	ptl = pmd_trans_huge_lock(pmdp, vma);

	if (ptl) {

		u64 flags = 0, frame = 0;

		pmd_t pmd = *pmdp;
@@ -1519,7 +1522,8 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, 
	pte_t *orig_pte;

	pte_t *pte;



	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

	ptl = pmd_trans_huge_lock(pmd, vma);

	if (ptl) {

		pte_t huge_pte = *(pte_t *)pmd;

		struct page *page;

fs/reiserfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int finish_unfinished(struct super_block *s) 
		pathrelse(&path);



		inode = reiserfs_iget(s, &obj_key);

		if (!inode) {

		if (IS_ERR_OR_NULL(inode)) {

			/*

			 * the unlink almost completed, it just did not

			 * manage to remove "save" link and release objectid

include/linux/huge_mm.h

+8 −8
Original line number Diff line number Diff line
@@ -120,15 +120,15 @@ extern void vma_adjust_trans_huge(struct vm_area_struct *vma, 
				    unsigned long start,

				    unsigned long end,

				    long adjust_next);

extern bool __pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl);

extern spinlock_t *__pmd_trans_huge_lock(pmd_t *pmd,

		struct vm_area_struct *vma);

/* mmap_sem must be held on entry */

static inline bool pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl)

static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd,

		struct vm_area_struct *vma)

{

	VM_BUG_ON_VMA(!rwsem_is_locked(&vma->vm_mm->mmap_sem), vma);

	if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd))

		return __pmd_trans_huge_lock(pmd, vma, ptl);

		return __pmd_trans_huge_lock(pmd, vma);

	else

		return false;

}
@@ -190,10 +190,10 @@ static inline void vma_adjust_trans_huge(struct vm_area_struct *vma, 
					 long adjust_next)

{

}

static inline bool pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl)

static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd,

		struct vm_area_struct *vma)

{

	return false;

	return NULL;

}



static inline int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,

include/trace/events/huge_memory.h

+6 −6
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ SCAN_STATUS 


TRACE_EVENT(mm_khugepaged_scan_pmd,



	TP_PROTO(struct mm_struct *mm, unsigned long pfn, bool writable,

	TP_PROTO(struct mm_struct *mm, struct page *page, bool writable,

		 bool referenced, int none_or_zero, int status),



	TP_ARGS(mm, pfn, writable, referenced, none_or_zero, status),

	TP_ARGS(mm, page, writable, referenced, none_or_zero, status),



	TP_STRUCT__entry(

		__field(struct mm_struct *, mm)
@@ -62,7 +62,7 @@ TRACE_EVENT(mm_khugepaged_scan_pmd, 


	TP_fast_assign(

		__entry->mm = mm;

		__entry->pfn = pfn;

		__entry->pfn = page ? page_to_pfn(page) : -1;

		__entry->writable = writable;

		__entry->referenced = referenced;

		__entry->none_or_zero = none_or_zero;
@@ -104,10 +104,10 @@ TRACE_EVENT(mm_collapse_huge_page, 


TRACE_EVENT(mm_collapse_huge_page_isolate,



	TP_PROTO(unsigned long pfn, int none_or_zero,

	TP_PROTO(struct page *page, int none_or_zero,

		 bool referenced, bool  writable, int status),



	TP_ARGS(pfn, none_or_zero, referenced, writable, status),

	TP_ARGS(page, none_or_zero, referenced, writable, status),



	TP_STRUCT__entry(

		__field(unsigned long, pfn)
@@ -118,7 +118,7 @@ TRACE_EVENT(mm_collapse_huge_page_isolate, 
	),



	TP_fast_assign(

		__entry->pfn = pfn;

		__entry->pfn = page ? page_to_pfn(page) : -1;

		__entry->none_or_zero = none_or_zero;

		__entry->referenced = referenced;

		__entry->writable = writable;