Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 06:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

qnx6: Convert directory handling to use kmap_local

Browse Source 
Eliminates qnx6_put_page() and a few hidden calls to compound_head().

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) 2024-07-10 11:31:09 -04:00 committed by Christian Brauner
parent 1d49228f27
commit 25689405bc
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/qnx6/dir.c
View File

@ -32,7 +32,7 @@ static void *qnx6_get_folio(struct inode *dir, unsigned long n,
if (IS_ERR(folio)) if (IS_ERR(folio))
return folio; return folio;
*foliop = folio; *foliop = folio;
return kmap(&folio->page); return kmap_local_folio(folio, 0);
} }
static unsigned last_entry(struct inode *inode, unsigned long page_nr) static unsigned last_entry(struct inode *inode, unsigned long page_nr)
@ -59,7 +59,7 @@ static struct qnx6_long_filename *qnx6_longname(struct super_block *sb,
return ERR_CAST(folio); return ERR_CAST(folio);
offs = offset_in_folio(folio, s << sb->s_blocksize_bits); offs = offset_in_folio(folio, s << sb->s_blocksize_bits);
*foliop = folio; *foliop = folio;
return kmap(&folio->page) + offs; return kmap_local_folio(folio, offs);
} }
static int qnx6_dir_longfilename(struct inode *inode, static int qnx6_dir_longfilename(struct inode *inode,
@ -90,7 +90,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
if (lf_size > QNX6_LONG_NAME_MAX) { if (lf_size > QNX6_LONG_NAME_MAX) {
pr_debug("file %s\n", lf->lf_fname); pr_debug("file %s\n", lf->lf_fname);
pr_err("Filename too long (%i)\n", lf_size); pr_err("Filename too long (%i)\n", lf_size);
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
return 0; return 0;
} }
@ -103,11 +103,11 @@ static int qnx6_dir_longfilename(struct inode *inode,
pr_debug("qnx6_readdir:%.*s inode:%u\n", pr_debug("qnx6_readdir:%.*s inode:%u\n",
lf_size, lf->lf_fname, de_inode); lf_size, lf->lf_fname, de_inode);
if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) { if (!dir_emit(ctx, lf->lf_fname, lf_size, de_inode, DT_UNKNOWN)) {
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
return 0; return 0;
} }
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
/* success */ /* success */
return 1; return 1;
} }
@ -168,7 +168,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)
} }
} }
} }
qnx6_put_page(&folio->page); folio_release_kmap(folio, kaddr);
} }
return 0; return 0;
} }
@ -190,14 +190,14 @@ static unsigned qnx6_long_match(int len, const char *name,
thislen = fs16_to_cpu(sbi, lf->lf_size); thislen = fs16_to_cpu(sbi, lf->lf_size);
if (len != thislen) { if (len != thislen) {
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
return 0; return 0;
} }
if (memcmp(name, lf->lf_fname, len) == 0) { if (memcmp(name, lf->lf_fname, len) == 0) {
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
return fs32_to_cpu(sbi, de->de_inode); return fs32_to_cpu(sbi, de->de_inode);
} }
qnx6_put_page(&folio->page); folio_release_kmap(folio, lf);
return 0; return 0;
} }
@ -256,7 +256,7 @@ unsigned qnx6_find_ino(int len, struct inode *dir, const char *name)
} else } else
pr_err("undefined filename size in inode.\n"); pr_err("undefined filename size in inode.\n");
} }
qnx6_put_page(&folio->page); folio_release_kmap(folio, de - i);
} }
if (++n >= npages) if (++n >= npages)
@ -266,7 +266,7 @@ unsigned qnx6_find_ino(int len, struct inode *dir, const char *name)
found: found:
ei->i_dir_start_lookup = n; ei->i_dir_start_lookup = n;
qnx6_put_page(&folio->page); folio_release_kmap(folio, de);
return ino; return ino;
} }

6
fs/qnx6/qnx6.h
View File

@ -126,10 +126,4 @@ static inline __fs16 cpu_to_fs16(struct qnx6_sb_info *sbi, __u16 n)
extern struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, extern struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s,
int silent); int silent);
static inline void qnx6_put_page(struct page *page)
{
kunmap(page);
put_page(page);
}
unsigned qnx6_find_ino(int len, struct inode *dir, const char *name); unsigned qnx6_find_ino(int len, struct inode *dir, const char *name);