From: Namhyung Kim <namhyung@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 03/12] mm: wrap get_locked_pte() using __cond_lock()
Date: Thu, 30 Sep 2010 12:50:12 +0900 [thread overview]
Message-ID: <1285818621-29890-4-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1285818621-29890-1-git-send-email-namhyung@gmail.com>
The get_locked_pte() conditionally grabs 'ptl' in case of returning
non-NULL. This leads sparse to complain about context imbalance.
Rename and wrap it using __cond_lock() to make sparse happy.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
include/linux/mm.h | 10 +++++++++-
mm/memory.c | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 74949fb..e48616d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1023,7 +1023,15 @@ extern void unregister_shrinker(struct shrinker *);
int vma_wants_writenotify(struct vm_area_struct *vma);
-extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
+extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
+ spinlock_t **ptl);
+static inline pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr,
+ spinlock_t **ptl)
+{
+ pte_t *ptep;
+ __cond_lock(*ptl, ptep = __get_locked_pte(mm, addr, ptl));
+ return ptep;
+}
#ifdef __PAGETABLE_PUD_FOLDED
static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
diff --git a/mm/memory.c b/mm/memory.c
index 0e18b4d..219b50a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1590,7 +1590,7 @@ struct page *get_dump_page(unsigned long addr)
}
#endif /* CONFIG_ELF_CORE */
-pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr,
+pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
spinlock_t **ptl)
{
pgd_t * pgd = pgd_offset(mm, addr);
--
1.7.2.2
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-09-30 3:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 3:50 [PATCH 00/12] mm: fix sparse warnings Namhyung Kim
2010-09-30 3:50 ` [PATCH 01/12] mm: remove temporary variable on generic_file_direct_write() Namhyung Kim
2010-09-30 3:50 ` [PATCH 02/12] mm: add casts to/from gfp_t in gfp_to_alloc_flags() Namhyung Kim
2010-09-30 3:50 ` Namhyung Kim [this message]
2010-09-30 3:50 ` [PATCH 04/12] mm: add lock release annotation on do_wp_page() Namhyung Kim
2010-09-30 3:50 ` [PATCH 05/12] mm: wrap follow_pte() using __cond_lock() Namhyung Kim
2010-09-30 3:50 ` [PATCH 06/12] rmap: annotate lock context change on page_[un]lock_anon_vma() Namhyung Kim
2010-09-30 3:50 ` [PATCH 07/12] rmap: wrap page_check_address() using __cond_lock() Namhyung Kim
2010-09-30 3:50 ` [PATCH 08/12] rmap: make anon_vma_[chain_]free() static Namhyung Kim
2010-09-30 3:50 ` [PATCH 09/12] vmalloc: rename temporary variable in __insert_vmap_area() Namhyung Kim
2010-09-30 3:50 ` [PATCH 10/12] vmalloc: annotate lock context change on s_start/stop() Namhyung Kim
2010-09-30 3:50 ` [PATCH 11/12] mm: declare some external symbols Namhyung Kim
2010-09-30 3:50 ` [PATCH 12/12] vmstat: include compaction.h when CONFIG_COMPACTION Namhyung Kim
2010-10-05 21:27 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285818621-29890-4-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).