diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:04:47 +0200 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:41:49 +0200 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /fs/xfs/xfs_dir2_readdir.c | |
| parent | Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm... (diff) | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz linux-13acfd5715144518232d8e29acf7c76ef1b089d8.zip | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'fs/xfs/xfs_dir2_readdir.c')
| -rw-r--r-- | fs/xfs/xfs_dir2_readdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c index 8993ec17452c..8f84153e98a8 100644 --- a/fs/xfs/xfs_dir2_readdir.c +++ b/fs/xfs/xfs_dir2_readdir.c @@ -119,9 +119,9 @@ xfs_dir2_sf_getdents( * mp->m_dirdatablk. */ dot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, - XFS_DIR3_DATA_DOT_OFFSET(mp)); + xfs_dir3_data_dot_offset(mp)); dotdot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, - XFS_DIR3_DATA_DOTDOT_OFFSET(mp)); + xfs_dir3_data_dotdot_offset(mp)); /* * Put . entry unless we're starting past it. |