Skip to content

Commit

Permalink
mm: wrap follow_pte() using __cond_lock()
Browse files Browse the repository at this point in the history
The follow_pte() conditionally grabs *@ptlp in case of returning 0.
Rename and wrap it using __cond_lock() removes following warnings:

 mm/memory.c:2337:9: warning: context imbalance in 'do_wp_page' - unexpected unlock
 mm/memory.c:3142:19: warning: context imbalance in 'handle_mm_fault' - different lock contexts for basic block

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed Oct 26, 2010
1 parent e6219ec commit 1b36ba8
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -3351,7 +3351,7 @@ int in_gate_area_no_task(unsigned long addr)

#endif /* __HAVE_ARCH_GATE_AREA */

static int follow_pte(struct mm_struct *mm, unsigned long address,
static int __follow_pte(struct mm_struct *mm, unsigned long address,
pte_t **ptepp, spinlock_t **ptlp)
{
pgd_t *pgd;
Expand Down Expand Up @@ -3388,6 +3388,17 @@ static int follow_pte(struct mm_struct *mm, unsigned long address,
return -EINVAL;
}

static inline int follow_pte(struct mm_struct *mm, unsigned long address,
pte_t **ptepp, spinlock_t **ptlp)
{
int res;

/* (void) is needed to make gcc happy */
(void) __cond_lock(*ptlp,
!(res = __follow_pte(mm, address, ptepp, ptlp)));
return res;
}

/**
* follow_pfn - look up PFN at a user virtual address
* @vma: memory mapping
Expand Down

0 comments on commit 1b36ba8

Please sign in to comment.