diff options
| author | Qian Cai <cai@lca.pw> | 2020-07-17 16:01:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-07-17 20:31:23 +1000 |
| commit | 1be95f7455dd09576d85864b2a84c0b4fbeb8ed7 (patch) | |
| tree | 2cbb1999ee7b7543bfb691f98aeeef0f947b69e3 | |
| parent | 6ca030ecd0646ce1bb6bb73aaba667bf51eccf2d (diff) | |
| download | linux-1be95f7455dd09576d85864b2a84c0b4fbeb8ed7.tar.gz linux-1be95f7455dd09576d85864b2a84c0b4fbeb8ed7.tar.xz | |
mm-swapfile-fix-and-annotate-various-data-races-v2
add a missing annotation for si->flags in memory.c
Link: http://lkml.kernel.org/r/1581612647-5958-1-git-send-email-cai@lca.pw
Signed-off-by: Qian Cai <cai@lca.pw>
Cc: Marco Elver <elver@google.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | mm/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 3f6ce2d680fd..45e1dc0547ba 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3129,8 +3129,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (!page) { struct swap_info_struct *si = swp_swap_info(entry); - if (si->flags & SWP_SYNCHRONOUS_IO && - __swap_count(entry) == 1) { + if (data_race(si->flags & SWP_SYNCHRONOUS_IO) && + __swap_count(entry) == 1) { /* skip swapcache */ page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vmf->address); |