Skip to content

Commit 4812509

Browse files
author
Al Viro
committed
minixfs: use offset_in_page()
It's cheaper and more idiomatic than subtracting page_address() of the corresponding page... Reviewed-by: Fabio M. De Francesco <fabio.maria.de.francesco@linux.intel.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent b85ea95 commit 4812509

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

fs/minix/dir.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)
268268
return -EINVAL;
269269

270270
got_it:
271-
pos = page_offset(page) + p - (char *)page_address(page);
271+
pos = page_offset(page) + offset_in_page(p);
272272
err = minix_prepare_chunk(page, pos, sbi->s_dirsize);
273273
if (err)
274274
goto out_unlock;
@@ -296,8 +296,7 @@ int minix_add_link(struct dentry *dentry, struct inode *inode)
296296
int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
297297
{
298298
struct inode *inode = page->mapping->host;
299-
char *kaddr = page_address(page);
300-
loff_t pos = page_offset(page) + (char*)de - kaddr;
299+
loff_t pos = page_offset(page) + offset_in_page(de);
301300
struct minix_sb_info *sbi = minix_sb(inode->i_sb);
302301
unsigned len = sbi->s_dirsize;
303302
int err;
@@ -421,8 +420,7 @@ int minix_set_link(struct minix_dir_entry *de, struct page *page,
421420
{
422421
struct inode *dir = page->mapping->host;
423422
struct minix_sb_info *sbi = minix_sb(dir->i_sb);
424-
loff_t pos = page_offset(page) +
425-
(char *)de-(char*)page_address(page);
423+
loff_t pos = page_offset(page) + offset_in_page(de);
426424
int err;
427425

428426
lock_page(page);

0 commit comments

Comments
 (0)