mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
ufs: Convert ufs_get_page() to ufs_get_folio()
Use the same calling convention as ext2 (see commit 46022375ab)
so that we can transition to kmap_local in a future patch.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle)
Christian Brauner
parent
bf9883d577
commit
5fe08b1d7e
101
fs/ufs/dir.c
101
fs/ufs/dir.c
@ -191,19 +191,22 @@ fail:
|
||||
return false;
|
||||
}
|
||||
|
||||
static struct page *ufs_get_page(struct inode *dir, unsigned long n)
|
||||
static void *ufs_get_folio(struct inode *dir, unsigned long n,
|
||||
struct folio **foliop)
|
||||
{
|
||||
struct address_space *mapping = dir->i_mapping;
|
||||
struct folio *folio = read_mapping_folio(mapping, n, NULL);
|
||||
void *kaddr;
|
||||
|
||||
if (IS_ERR(folio))
|
||||
return &folio->page;
|
||||
kmap(&folio->page);
|
||||
return ERR_CAST(folio);
|
||||
kaddr = kmap(&folio->page);
|
||||
if (unlikely(!folio_test_checked(folio))) {
|
||||
if (!ufs_check_page(&folio->page))
|
||||
goto fail;
|
||||
}
|
||||
return &folio->page;
|
||||
*foliop = folio;
|
||||
return kaddr;
|
||||
|
||||
fail:
|
||||
ufs_put_page(&folio->page);
|
||||
@ -234,14 +237,14 @@ ufs_next_entry(struct super_block *sb, struct ufs_dir_entry *p)
|
||||
|
||||
struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p)
|
||||
{
|
||||
struct page *page = ufs_get_page(dir, 0);
|
||||
struct ufs_dir_entry *de = NULL;
|
||||
struct folio *folio;
|
||||
struct ufs_dir_entry *de = ufs_get_folio(dir, 0, &folio);
|
||||
|
||||
if (IS_ERR(de))
|
||||
return NULL;
|
||||
de = ufs_next_entry(dir->i_sb, de);
|
||||
*p = &folio->page;
|
||||
|
||||
if (!IS_ERR(page)) {
|
||||
de = ufs_next_entry(dir->i_sb,
|
||||
(struct ufs_dir_entry *)page_address(page));
|
||||
*p = page;
|
||||
}
|
||||
return de;
|
||||
}
|
||||
|
||||
@ -262,7 +265,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
|
||||
unsigned reclen = UFS_DIR_REC_LEN(namelen);
|
||||
unsigned long start, n;
|
||||
unsigned long npages = dir_pages(dir);
|
||||
struct page *page = NULL;
|
||||
struct folio *folio;
|
||||
struct ufs_inode_info *ui = UFS_I(dir);
|
||||
struct ufs_dir_entry *de;
|
||||
|
||||
@ -280,18 +283,17 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
|
||||
start = 0;
|
||||
n = start;
|
||||
do {
|
||||
char *kaddr;
|
||||
page = ufs_get_page(dir, n);
|
||||
if (!IS_ERR(page)) {
|
||||
kaddr = page_address(page);
|
||||
de = (struct ufs_dir_entry *) kaddr;
|
||||
char *kaddr = ufs_get_folio(dir, n, &folio);
|
||||
|
||||
if (!IS_ERR(kaddr)) {
|
||||
de = (struct ufs_dir_entry *)kaddr;
|
||||
kaddr += ufs_last_byte(dir, n) - reclen;
|
||||
while ((char *) de <= kaddr) {
|
||||
if (ufs_match(sb, namelen, name, de))
|
||||
goto found;
|
||||
de = ufs_next_entry(sb, de);
|
||||
}
|
||||
ufs_put_page(page);
|
||||
ufs_put_page(&folio->page);
|
||||
}
|
||||
if (++n >= npages)
|
||||
n = 0;
|
||||
@ -300,7 +302,7 @@ out:
|
||||
return NULL;
|
||||
|
||||
found:
|
||||
*res_page = page;
|
||||
*res_page = &folio->page;
|
||||
ui->i_dir_start_lookup = n;
|
||||
return de;
|
||||
}
|
||||
@ -317,11 +319,10 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
|
||||
unsigned reclen = UFS_DIR_REC_LEN(namelen);
|
||||
const unsigned int chunk_size = UFS_SB(sb)->s_uspi->s_dirblksize;
|
||||
unsigned short rec_len, name_len;
|
||||
struct page *page = NULL;
|
||||
struct folio *folio = NULL;
|
||||
struct ufs_dir_entry *de;
|
||||
unsigned long npages = dir_pages(dir);
|
||||
unsigned long n;
|
||||
char *kaddr;
|
||||
loff_t pos;
|
||||
int err;
|
||||
|
||||
@ -329,21 +330,19 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
|
||||
|
||||
/*
|
||||
* We take care of directory expansion in the same loop.
|
||||
* This code plays outside i_size, so it locks the page
|
||||
* This code plays outside i_size, so it locks the folio
|
||||
* to protect that region.
|
||||
*/
|
||||
for (n = 0; n <= npages; n++) {
|
||||
char *kaddr = ufs_get_folio(dir, n, &folio);
|
||||
char *dir_end;
|
||||
|
||||
page = ufs_get_page(dir, n);
|
||||
err = PTR_ERR(page);
|
||||
if (IS_ERR(page))
|
||||
goto out;
|
||||
lock_page(page);
|
||||
kaddr = page_address(page);
|
||||
if (IS_ERR(kaddr))
|
||||
return PTR_ERR(kaddr);
|
||||
folio_lock(folio);
|
||||
dir_end = kaddr + ufs_last_byte(dir, n);
|
||||
de = (struct ufs_dir_entry *)kaddr;
|
||||
kaddr += PAGE_SIZE - reclen;
|
||||
kaddr += folio_size(folio) - reclen;
|
||||
while ((char *)de <= kaddr) {
|
||||
if ((char *)de == dir_end) {
|
||||
/* We hit i_size */
|
||||
@ -370,16 +369,15 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
|
||||
goto got_it;
|
||||
de = (struct ufs_dir_entry *) ((char *) de + rec_len);
|
||||
}
|
||||
unlock_page(page);
|
||||
ufs_put_page(page);
|
||||
folio_unlock(folio);
|
||||
ufs_put_page(&folio->page);
|
||||
}
|
||||
BUG();
|
||||
return -EINVAL;
|
||||
|
||||
got_it:
|
||||
pos = page_offset(page) +
|
||||
(char*)de - (char*)page_address(page);
|
||||
err = ufs_prepare_chunk(page, pos, rec_len);
|
||||
pos = folio_pos(folio) + offset_in_folio(folio, de);
|
||||
err = ufs_prepare_chunk(&folio->page, pos, rec_len);
|
||||
if (err)
|
||||
goto out_unlock;
|
||||
if (de->d_ino) {
|
||||
@ -396,18 +394,17 @@ got_it:
|
||||
de->d_ino = cpu_to_fs32(sb, inode->i_ino);
|
||||
ufs_set_de_type(sb, de, inode->i_mode);
|
||||
|
||||
ufs_commit_chunk(page, pos, rec_len);
|
||||
ufs_commit_chunk(&folio->page, pos, rec_len);
|
||||
inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
|
||||
|
||||
mark_inode_dirty(dir);
|
||||
err = ufs_handle_dirsync(dir);
|
||||
/* OFFSET_CACHE */
|
||||
out_put:
|
||||
ufs_put_page(page);
|
||||
out:
|
||||
ufs_put_page(&folio->page);
|
||||
return err;
|
||||
out_unlock:
|
||||
unlock_page(page);
|
||||
folio_unlock(folio);
|
||||
goto out_put;
|
||||
}
|
||||
|
||||
@ -445,19 +442,18 @@ ufs_readdir(struct file *file, struct dir_context *ctx)
|
||||
return 0;
|
||||
|
||||
for ( ; n < npages; n++, offset = 0) {
|
||||
char *kaddr, *limit;
|
||||
struct ufs_dir_entry *de;
|
||||
struct folio *folio;
|
||||
char *kaddr = ufs_get_folio(inode, n, &folio);
|
||||
char *limit;
|
||||
|
||||
struct page *page = ufs_get_page(inode, n);
|
||||
|
||||
if (IS_ERR(page)) {
|
||||
if (IS_ERR(kaddr)) {
|
||||
ufs_error(sb, __func__,
|
||||
"bad page in #%lu",
|
||||
inode->i_ino);
|
||||
ctx->pos += PAGE_SIZE - offset;
|
||||
return -EIO;
|
||||
return PTR_ERR(kaddr);
|
||||
}
|
||||
kaddr = page_address(page);
|
||||
if (unlikely(need_revalidate)) {
|
||||
if (offset) {
|
||||
offset = ufs_validate_entry(sb, kaddr, offset, chunk_mask);
|
||||
@ -483,13 +479,13 @@ ufs_readdir(struct file *file, struct dir_context *ctx)
|
||||
ufs_get_de_namlen(sb, de),
|
||||
fs32_to_cpu(sb, de->d_ino),
|
||||
d_type)) {
|
||||
ufs_put_page(page);
|
||||
ufs_put_page(&folio->page);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ctx->pos += fs16_to_cpu(sb, de->d_reclen);
|
||||
}
|
||||
ufs_put_page(page);
|
||||
ufs_put_page(&folio->page);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -600,18 +596,17 @@ fail:
|
||||
int ufs_empty_dir(struct inode * inode)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct page *page = NULL;
|
||||
struct folio *folio;
|
||||
char *kaddr;
|
||||
unsigned long i, npages = dir_pages(inode);
|
||||
|
||||
for (i = 0; i < npages; i++) {
|
||||
char *kaddr;
|
||||
struct ufs_dir_entry *de;
|
||||
page = ufs_get_page(inode, i);
|
||||
|
||||
if (IS_ERR(page))
|
||||
kaddr = ufs_get_folio(inode, i, &folio);
|
||||
if (IS_ERR(kaddr))
|
||||
continue;
|
||||
|
||||
kaddr = page_address(page);
|
||||
de = (struct ufs_dir_entry *)kaddr;
|
||||
kaddr += ufs_last_byte(inode, i) - UFS_DIR_REC_LEN(1);
|
||||
|
||||
@ -638,12 +633,12 @@ int ufs_empty_dir(struct inode * inode)
|
||||
}
|
||||
de = ufs_next_entry(sb, de);
|
||||
}
|
||||
ufs_put_page(page);
|
||||
ufs_put_page(&folio->page);
|
||||
}
|
||||
return 1;
|
||||
|
||||
not_empty:
|
||||
ufs_put_page(page);
|
||||
ufs_put_page(&folio->page);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user