Skip to content

Commit 633423a

Browse files
Christoph Hellwigtorvalds
authored andcommitted
mm: mark swap_lock and swap_active_head static
swap_lock and swap_active_head are only used in swapfile.c, so mark them static. Link: https://lkml.kernel.org/r/20211224062246.1258487-12-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Juergen Gross <jgross@suse.com> Cc: Dan Streetman <ddstreet@ieee.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Hugh Dickins <hughd@google.com> Cc: Konrad Rzeszutek Wilk <Konrad.wilk@oracle.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Seth Jennings <sjenning@redhat.com> Cc: Vitaly Wool <vitaly.wool@konsulko.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent f328c1d commit 633423a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

include/linux/swapfile.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* these were static in swapfile.c but frontswap.c needs them and we don't
77
* want to expose them to the dozens of source files that include swap.h
88
*/
9-
extern spinlock_t swap_lock;
10-
extern struct plist_head swap_active_head;
119
extern struct swap_info_struct *swap_info[];
1210
extern unsigned long generic_max_swapfile_size(void);
1311
extern unsigned long max_swapfile_size(void);

mm/swapfile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
4949
unsigned char);
5050
static void free_swap_count_continuations(struct swap_info_struct *);
5151

52-
DEFINE_SPINLOCK(swap_lock);
52+
static DEFINE_SPINLOCK(swap_lock);
5353
static unsigned int nr_swapfiles;
5454
atomic_long_t nr_swap_pages;
5555
/*
@@ -71,7 +71,7 @@ static const char Unused_offset[] = "Unused swap offset entry ";
7171
* all active swap_info_structs
7272
* protected with swap_lock, and ordered by priority.
7373
*/
74-
PLIST_HEAD(swap_active_head);
74+
static PLIST_HEAD(swap_active_head);
7575

7676
/*
7777
* all available (active, not full) swap_info_structs

0 commit comments

Comments
 (0)