From: Andrew Morton Cc: Cc: Christoph Lameter Signed-off-by: Andrew Morton --- fs/ext2/dir.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff -puN fs/ext2/dir.c~use-page_cache_xxx-in-ext2-fix fs/ext2/dir.c --- a/fs/ext2/dir.c~use-page_cache_xxx-in-ext2-fix +++ a/fs/ext2/dir.c @@ -170,8 +170,9 @@ Einumber: bad_entry: ext2_error (sb, "ext2_check_page", "bad entry in directory #%lu: %s - " "offset=%lu, inode=%lu, rec_len=%d, name_len=%d", - dir->i_ino, error, page_cache_pos(mapping, page->index, offs), - (unsigned long) le32_to_cpu(p->inode), + dir->i_ino, error, + (unsigned long)page_cache_pos(mapping, page->index, offs), + (unsigned long)le32_to_cpu(p->inode), rec_len, p->name_len); goto fail; Eend: @@ -179,8 +180,9 @@ Eend: ext2_error (sb, "ext2_check_page", "entry in directory #%lu spans the page boundary" "offset=%lu, inode=%lu", - dir->i_ino, page_cache_pos(mapping, page->index, offs), - (unsigned long) le32_to_cpu(p->inode)); + dir->i_ino, + (unsigned long)page_cache_pos(mapping, page->index, offs), + (unsigned long)le32_to_cpu(p->inode)); fail: SetPageChecked(page); SetPageError(page); @@ -301,7 +303,7 @@ ext2_readdir (struct file * filp, void * ext2_error(sb, __FUNCTION__, "bad page in #%lu", inode->i_ino); - filp->f_pos += page_cache_size(mapping) - offset + filp->f_pos += page_cache_size(mapping) - offset; return PTR_ERR(page); } kaddr = page_address(page); _