From: Nick Piggin Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton --- fs/minix/dir.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/minix/dir.c~minix-convert-to-new-aops-fix fs/minix/dir.c --- a/fs/minix/dir.c~minix-convert-to-new-aops-fix +++ a/fs/minix/dir.c @@ -311,7 +311,7 @@ int minix_delete_entry(struct minix_dir_ struct address_space *mapping = page->mapping; struct inode *inode = (struct inode*)mapping->host; char *kaddr = page_address(page); - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + (char*)de - kaddr; + loff_t pos = page_offset(page) + (char*)de - kaddr; unsigned len = minix_sb(inode->i_sb)->s_dirsize; int err; @@ -435,7 +435,7 @@ void minix_set_link(struct minix_dir_ent struct address_space *mapping = page->mapping; struct inode *dir = mapping->host; struct minix_sb_info *sbi = minix_sb(dir->i_sb); - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + + loff_t pos = page_offset(page) + (char *)de-(char*)page_address(page); int err; _