diff options
| author | Dave Chinner | 2014-06-09 23:32:41 +0200 |
|---|---|---|
| committer | Dave Chinner | 2014-06-09 23:32:41 +0200 |
| commit | 8612c7e594808e4a67bc2d4661f5925df2be3f51 (patch) | |
| tree | bf13dd921033fb4aaba8bd5ad309e933b6427ad8 /fs/xfs/xfs_fsops.c | |
| parent | Merge branch 'xfs-feature-bit-cleanup' into for-next (diff) | |
| parent | xfs: fix xfs_da_args sparse warning in xfs_readdir (diff) | |
| download | kernel-qcow2-linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.tar.gz kernel-qcow2-linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.tar.xz kernel-qcow2-linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.zip | |
Merge branch 'xfs-da-geom' into for-next
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 97886a74e073..d2295561570a 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -24,6 +24,8 @@ #include "xfs_sb.h" #include "xfs_ag.h" #include "xfs_mount.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_inode.h" #include "xfs_trans.h" #include "xfs_inode_item.h" @@ -105,7 +107,7 @@ xfs_fs_geometry( geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? mp->m_sb.sb_logsectsize : BBSIZE; geo->rtsectsize = mp->m_sb.sb_blocksize; - geo->dirblocksize = mp->m_dirblksize; + geo->dirblocksize = mp->m_dir_geo->blksize; } if (new_version >= 4) { geo->flags |= |