xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: initialize page->private when using for our internal use

Browse Source 
We need to guarantee it's initially zero. Otherwise, it'll hurt entire flag
operations.

Bug: 192173168
Fixes: b763f3bedc2d ("f2fs: restructure f2fs page.private layout")
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit c9ebd3df43c0 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master)
Change-Id: I02211d4bd2b1cb526e5fbcd55673043e3082d011
This commit is contained in:
Jaegeuk Kim
2021-07-04 22:11:25 -07:00
committed by Jaegeuk Kim
parent dba79c3af3
commit 3ee5565017
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/data.c
View File

@@ -3876,6 +3876,8 @@ int f2fs_migrate_page(struct address_space *mapping,
get_page(newpage); get_page(newpage);
} }
/* guarantee to start from no stale private field */
set_page_private(newpage, 0);
if (PagePrivate(page)) { if (PagePrivate(page)) {
set_page_private(newpage, page_private(page)); set_page_private(newpage, page_private(page));
SetPagePrivate(newpage); SetPagePrivate(newpage);

5
fs/f2fs/f2fs.h
View File

@@ -1329,7 +1329,8 @@ enum {
#define PAGE_PRIVATE_GET_FUNC(name, flagname) \ #define PAGE_PRIVATE_GET_FUNC(name, flagname) \
static inline bool page_private_##name(struct page *page) \ static inline bool page_private_##name(struct page *page) \
{ \ { \
return test_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)) && \ return PagePrivate(page) && \
test_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)) && \
test_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \ test_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
} }
@@ -1339,6 +1340,7 @@ static inline void set_page_private_##name(struct page *page) \
if (!PagePrivate(page)) { \ if (!PagePrivate(page)) { \
get_page(page); \ get_page(page); \
SetPagePrivate(page); \ SetPagePrivate(page); \
set_page_private(page, 0); \
} \ } \
set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \ set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \
set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \ set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
@@ -1390,6 +1392,7 @@ static inline void set_page_private_data(struct page *page, unsigned long data)
if (!PagePrivate(page)) { if (!PagePrivate(page)) {
get_page(page); get_page(page);
SetPagePrivate(page); SetPagePrivate(page);
set_page_private(page, 0);
} }
set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page));
page_private(page) |= data << PAGE_PRIVATE_MAX; page_private(page) |= data << PAGE_PRIVATE_MAX;