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

nilfs2: return the mapped address from nilfs_get_page()

Browse Source 
[ Upstream commit 09a46acb3697e50548bb265afa1d79163659dd85 ]

In prepartion for switching from kmap() to kmap_local(), return the kmap
address from nilfs_get_page() instead of having the caller look up
page_address().

[konishi.ryusuke: fixed a missing blank line after declaration]
Link: https://lkml.kernel.org/r/20231127143036.2425-7-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: 7373a51e7998 ("nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2023-11-27 23:30:25 +09:00
committed by Greg Kroah-Hartman
parent 8b56df81b3
commit adf1b931d5
1 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
fs/nilfs2/dir.c
View File

@@ -186,19 +186,24 @@ fail:
return false; return false;
} }
static struct page *nilfs_get_page(struct inode *dir, unsigned long n) static void *nilfs_get_page(struct inode *dir, unsigned long n,
struct page **pagep)
{ {
struct address_space *mapping = dir->i_mapping; struct address_space *mapping = dir->i_mapping;
struct page *page = read_mapping_page(mapping, n, NULL); struct page *page = read_mapping_page(mapping, n, NULL);
void *kaddr;
if (!IS_ERR(page)) { if (IS_ERR(page))
kmap(page); return page;
kaddr = kmap(page);
if (unlikely(!PageChecked(page))) { if (unlikely(!PageChecked(page))) {
if (!nilfs_check_page(page)) if (!nilfs_check_page(page))
goto fail; goto fail;
} }
}
return page; *pagep = page;
return kaddr;
fail: fail:
nilfs_put_page(page); nilfs_put_page(page);
@@ -275,14 +280,14 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)
for ( ; n < npages; n++, offset = 0) { for ( ; n < npages; n++, offset = 0) {
char *kaddr, *limit; char *kaddr, *limit;
struct nilfs_dir_entry *de; struct nilfs_dir_entry *de;
struct page *page = nilfs_get_page(inode, n); struct page *page;
if (IS_ERR(page)) { kaddr = nilfs_get_page(inode, n, &page);
if (IS_ERR(kaddr)) {
nilfs_error(sb, "bad page in #%lu", inode->i_ino); nilfs_error(sb, "bad page in #%lu", inode->i_ino);
ctx->pos += PAGE_SIZE - offset; ctx->pos += PAGE_SIZE - offset;
return -EIO; return -EIO;
} }
kaddr = page_address(page);
de = (struct nilfs_dir_entry *)(kaddr + offset); de = (struct nilfs_dir_entry *)(kaddr + offset);
limit = kaddr + nilfs_last_byte(inode, n) - limit = kaddr + nilfs_last_byte(inode, n) -
NILFS_DIR_REC_LEN(1); NILFS_DIR_REC_LEN(1);
@@ -345,11 +350,9 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
start = 0; start = 0;
n = start; n = start;
do { do {
char *kaddr; char *kaddr = nilfs_get_page(dir, n, &page);
page = nilfs_get_page(dir, n); if (!IS_ERR(kaddr)) {
if (!IS_ERR(page)) {
kaddr = page_address(page);
de = (struct nilfs_dir_entry *)kaddr; de = (struct nilfs_dir_entry *)kaddr;
kaddr += nilfs_last_byte(dir, n) - reclen; kaddr += nilfs_last_byte(dir, n) - reclen;
while ((char *) de <= kaddr) { while ((char *) de <= kaddr) {
@@ -387,15 +390,11 @@ found:
struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p) struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p)
{ {
struct page *page = nilfs_get_page(dir, 0); struct nilfs_dir_entry *de = nilfs_get_page(dir, 0, p);
struct nilfs_dir_entry *de = NULL;
if (!IS_ERR(page)) { if (IS_ERR(de))
de = nilfs_next_entry( return NULL;
(struct nilfs_dir_entry *)page_address(page)); return nilfs_next_entry(de);
*p = page;
}
return de;
} }
ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr) ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
@@ -459,12 +458,11 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode)
for (n = 0; n <= npages; n++) { for (n = 0; n <= npages; n++) {
char *dir_end; char *dir_end;
page = nilfs_get_page(dir, n); kaddr = nilfs_get_page(dir, n, &page);
err = PTR_ERR(page); err = PTR_ERR(kaddr);
if (IS_ERR(page)) if (IS_ERR(kaddr))
goto out; goto out;
lock_page(page); lock_page(page);
kaddr = page_address(page);
dir_end = kaddr + nilfs_last_byte(dir, n); dir_end = kaddr + nilfs_last_byte(dir, n);
de = (struct nilfs_dir_entry *)kaddr; de = (struct nilfs_dir_entry *)kaddr;
kaddr += PAGE_SIZE - reclen; kaddr += PAGE_SIZE - reclen;
@@ -627,11 +625,10 @@ int nilfs_empty_dir(struct inode *inode)
char *kaddr; char *kaddr;
struct nilfs_dir_entry *de; struct nilfs_dir_entry *de;
page = nilfs_get_page(inode, i); kaddr = nilfs_get_page(inode, i, &page);
if (IS_ERR(page)) if (IS_ERR(kaddr))
continue; continue;
kaddr = page_address(page);
de = (struct nilfs_dir_entry *)kaddr; de = (struct nilfs_dir_entry *)kaddr;
kaddr += nilfs_last_byte(inode, i) - NILFS_DIR_REC_LEN(1); kaddr += nilfs_last_byte(inode, i) - NILFS_DIR_REC_LEN(1);