mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

ext2_put_page(): accept any pointer within the page

Browse source 
eliminates the need to keep the pointer to the first byte within
the page if we are guaranteed to have pointers to some byte
in the same page at hand.

Don't backport without commit 88d7b12068 ("highmem: round down the
address passed to kunmap_flush_on_unmap()").

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Tested-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Al Viro 2022-12-13 20:14:50 -05:00 committed by Jan Kara
parent 46022375ab
commit 91f646fb97
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
fs/ext2/dir.c
View file

@ -299,7 +299,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(sb, __func__, ext2_error(sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ext2_put_page(page, kaddr); ext2_put_page(page, de);
return -EIO; return -EIO;
} }
if (de->inode) { if (de->inode) {
@ -311,7 +311,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
if (!dir_emit(ctx, de->name, de->name_len, if (!dir_emit(ctx, de->name, de->name_len,
le32_to_cpu(de->inode), le32_to_cpu(de->inode),
d_type)) { d_type)) {
ext2_put_page(page, kaddr); ext2_put_page(page, de);
return 0; return 0;
} }
} }
@ -377,14 +377,14 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir,
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(dir->i_sb, __func__, ext2_error(dir->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ext2_put_page(page, page_addr); ext2_put_page(page, de);
goto out; goto out;
} }
if (ext2_match(namelen, name, de)) if (ext2_match(namelen, name, de))
goto found; goto found;
de = ext2_next_entry(de); de = ext2_next_entry(de);
} }
ext2_put_page(page, page_addr); ext2_put_page(page, kaddr);
if (++n >= npages) if (++n >= npages)
n = 0; n = 0;
@ -443,7 +443,7 @@ int ext2_inode_by_name(struct inode *dir, const struct qstr *child, ino_t *ino)
return PTR_ERR(de); return PTR_ERR(de);
*ino = le32_to_cpu(de->inode); *ino = le32_to_cpu(de->inode);
ext2_put_page(page, page_addr); ext2_put_page(page, de);
return 0; return 0;
} }
@ -499,7 +499,6 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
unsigned reclen = EXT2_DIR_REC_LEN(namelen); unsigned reclen = EXT2_DIR_REC_LEN(namelen);
unsigned short rec_len, name_len; unsigned short rec_len, name_len;
struct page *page = NULL; struct page *page = NULL;
void *page_addr = NULL;
ext2_dirent * de; ext2_dirent * de;
unsigned long npages = dir_pages(dir); unsigned long npages = dir_pages(dir);
unsigned long n; unsigned long n;
@ -515,11 +514,10 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
char *kaddr; char *kaddr;
char *dir_end; char *dir_end;
page_addr = ext2_get_page(dir, n, 0, &page); kaddr = ext2_get_page(dir, n, 0, &page);
if (IS_ERR(page_addr)) if (IS_ERR(kaddr))
return PTR_ERR(page_addr); return PTR_ERR(kaddr);
lock_page(page); lock_page(page);
kaddr = page_addr;
dir_end = kaddr + ext2_last_byte(dir, n); dir_end = kaddr + ext2_last_byte(dir, n);
de = (ext2_dirent *)kaddr; de = (ext2_dirent *)kaddr;
kaddr += PAGE_SIZE - reclen; kaddr += PAGE_SIZE - reclen;
@ -550,7 +548,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
de = (ext2_dirent *) ((char *) de + rec_len); de = (ext2_dirent *) ((char *) de + rec_len);
} }
unlock_page(page); unlock_page(page);
ext2_put_page(page, page_addr); ext2_put_page(page, kaddr);
} }
BUG(); BUG();
return -EINVAL; return -EINVAL;
@ -577,7 +575,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
err = ext2_handle_dirsync(dir); err = ext2_handle_dirsync(dir);
/* OFFSET_CACHE */ /* OFFSET_CACHE */
out_put: out_put:
ext2_put_page(page, page_addr); ext2_put_page(page, de);
return err; return err;
out_unlock: out_unlock:
unlock_page(page); unlock_page(page);
@ -675,19 +673,17 @@ int ext2_make_empty(struct inode *inode, struct inode *parent)
*/ */
int ext2_empty_dir (struct inode * inode) int ext2_empty_dir (struct inode * inode)
{ {
void *page_addr = NULL; struct page *page;
struct page *page = NULL; char *kaddr;
unsigned long i, npages = dir_pages(inode); unsigned long i, npages = dir_pages(inode);
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
char *kaddr; ext2_dirent *de;
ext2_dirent * de;
page_addr = ext2_get_page(inode, i, 0, &page);
if (IS_ERR(page_addr)) kaddr = ext2_get_page(inode, i, 0, &page);
if (IS_ERR(kaddr))
return 0; return 0;
kaddr = page_addr;
de = (ext2_dirent *)kaddr; de = (ext2_dirent *)kaddr;
kaddr += ext2_last_byte(inode, i) - EXT2_DIR_REC_LEN(1); kaddr += ext2_last_byte(inode, i) - EXT2_DIR_REC_LEN(1);
@ -713,12 +709,12 @@ int ext2_empty_dir (struct inode * inode)
} }
de = ext2_next_entry(de); de = ext2_next_entry(de);
} }
ext2_put_page(page, page_addr); ext2_put_page(page, kaddr);
} }
return 1; return 1;
not_empty: not_empty:
ext2_put_page(page, page_addr); ext2_put_page(page, kaddr);
return 0; return 0;
} }

8
fs/ext2/namei.c
View file

@ -288,7 +288,7 @@ static int ext2_unlink(struct inode * dir, struct dentry *dentry)
} }
err = ext2_delete_entry (de, page, page_addr); err = ext2_delete_entry (de, page, page_addr);
ext2_put_page(page, page_addr); ext2_put_page(page, de);
if (err) if (err)
goto out; goto out;
@ -370,7 +370,7 @@ static int ext2_rename (struct mnt_idmap * idmap,
} }
err = ext2_set_link(new_dir, new_de, new_page, page_addr, err = ext2_set_link(new_dir, new_de, new_page, page_addr,
old_inode, true); old_inode, true);
ext2_put_page(new_page, page_addr); ext2_put_page(new_page, new_de);
if (err) if (err)
goto out_dir; goto out_dir;
new_inode->i_ctime = current_time(new_inode); new_inode->i_ctime = current_time(new_inode);
@ -402,9 +402,9 @@ static int ext2_rename (struct mnt_idmap * idmap,
} }
out_dir: out_dir:
if (dir_de) if (dir_de)
ext2_put_page(dir_page, dir_page_addr); ext2_put_page(dir_page, dir_de);
out_old: out_old:
ext2_put_page(old_page, old_page_addr); ext2_put_page(old_page, old_de);
return err; return err;
} }