The patch titled
Subject: mm: un-export wake_up_page functions
has been added to the -mm tree. Its filename is
mm-un-export-wake_up_page-functions.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-un-export-wake_up_page-functions.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-un-export-wake_up_page-functions.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Nicholas Piggin <npiggin@xxxxxxxxx>
Subject: mm: un-export wake_up_page functions
These are no longer used outside mm/filemap.c, so un-export them and make
them static where possible. These were exported specifically for NFS use
in commit a4796e37c12e ("MM: export page_wakeup functions").
Link: http://lkml.kernel.org/r/20170103182234.30141-3-npiggin@xxxxxxxxx
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Cc: Anna Schumaker <anna.schumaker@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/pagemap.h | 12 ++----------
mm/filemap.c | 10 ++++++++--
2 files changed, 10 insertions(+), 12 deletions(-)
diff -puN include/linux/pagemap.h~mm-un-export-wake_up_page-functions include/linux/pagemap.h
--- a/include/linux/pagemap.h~mm-un-export-wake_up_page-functions
+++ a/include/linux/pagemap.h
@@ -482,19 +482,11 @@ static inline int lock_page_or_retry(str
}
/*
- * This is exported only for wait_on_page_locked/wait_on_page_writeback,
- * and for filesystems which need to wait on PG_private.
+ * This is exported only for wait_on_page_locked/wait_on_page_writeback, etc.,
+ * and should not be used directly.
*/
extern void wait_on_page_bit(struct page *page, int bit_nr);
extern int wait_on_page_bit_killable(struct page *page, int bit_nr);
-extern void wake_up_page_bit(struct page *page, int bit_nr);
-
-static inline void wake_up_page(struct page *page, int bit)
-{
- if (!PageWaiters(page))
- return;
- wake_up_page_bit(page, bit);
-}
/*
* Wait for a page to be unlocked.
diff -puN mm/filemap.c~mm-un-export-wake_up_page-functions mm/filemap.c
--- a/mm/filemap.c~mm-un-export-wake_up_page-functions
+++ a/mm/filemap.c
@@ -788,7 +788,7 @@ static int wake_page_function(wait_queue
return autoremove_wake_function(wait, mode, sync, key);
}
-void wake_up_page_bit(struct page *page, int bit_nr)
+static void wake_up_page_bit(struct page *page, int bit_nr)
{
wait_queue_head_t *q = page_waitqueue(page);
struct wait_page_key key;
@@ -821,7 +821,13 @@ void wake_up_page_bit(struct page *page,
}
spin_unlock_irqrestore(&q->lock, flags);
}
-EXPORT_SYMBOL(wake_up_page_bit);
+
+static void wake_up_page(struct page *page, int bit)
+{
+ if (!PageWaiters(page))
+ return;
+ wake_up_page_bit(page, bit);
+}
static inline int wait_on_page_bit_common(wait_queue_head_t *q,
struct page *page, int bit_nr, int state, bool lock)
_
Patches currently in -mm which might be from npiggin@xxxxxxxxx are
nfs-no-pg_private-waiters-remain-remove-waker.patch
mm-un-export-wake_up_page-functions.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
