diff --git a/[refs] b/[refs] index 88368448487b..ef20ded86d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8bc5f4fde376c9eee524a9a2b7e85560e604e85 +refs/heads/master: 7e8536797d4508ddc790cc3af6a281db1582d485 diff --git a/trunk/fs/ocfs2/dir.c b/trunk/fs/ocfs2/dir.c index d1f92fd2ed96..dbfa6f66291a 100644 --- a/trunk/fs/ocfs2/dir.c +++ b/trunk/fs/ocfs2/dir.c @@ -512,7 +512,7 @@ static int ocfs2_dir_foreach_blk(struct inode *inode, unsigned long *f_version, error = filldir(priv, de->name, de->name_len, *f_pos, - ino_from_blkno(sb, le64_to_cpu(de->inode)), + le64_to_cpu(de->inode), d_type); if (error) break;