diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 14:47:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 14:47:22 -0700 |
| commit | 3dbecf0aa9692cffbb71313a380c0ecc606c5920 (patch) | |
| tree | 6e6f92be3d44da1e16b73c42a090b1b4971b7986 /fs/xfs/xfs_dir2_readdir.c | |
| parent | ab3540626435c01e08fe58ce544311a78430f112 (diff) | |
| parent | b2a42f78ab475f4730300b0e9568bc3b2587d112 (diff) | |
| download | linux-stable-3dbecf0aa9692cffbb71313a380c0ecc606c5920.tar.gz linux-stable-3dbecf0aa9692cffbb71313a380c0ecc606c5920.tar.bz2 linux-stable-3dbecf0aa9692cffbb71313a380c0ecc606c5920.zip | |
Merge tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs
Pull xfs bugfixes from Ben Myers:
"There are lockdep annotations for project quotas, a fix for dirent
dtype support on v4 filesystems, a fix for a memory leak in recovery,
and a fix for the build error that resulted from it. D'oh"
* tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs:
xfs: Use kmem_free() instead of free()
xfs: fix memory leak in xlog_recover_add_to_trans
xfs: dirent dtype presence is dependent on directory magic numbers
xfs: lockdep needs to know about 3 dquot-deep nesting
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. |