diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-06-10 07:32:41 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-06-10 07:32:41 +1000 |
| commit | 8612c7e594808e4a67bc2d4661f5925df2be3f51 (patch) | |
| tree | bf13dd921033fb4aaba8bd5ad309e933b6427ad8 /fs/xfs/xfs_log_rlimit.c | |
| parent | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (diff) | |
| parent | 35f46c5f04cc7c45ce59d3ba4c28ba138184414b (diff) | |
| download | linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.tar.gz linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.tar.bz2 linux-8612c7e594808e4a67bc2d4661f5925df2be3f51.zip | |
Merge branch 'xfs-da-geom' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_rlimit.c')
| -rw-r--r-- | fs/xfs/xfs_log_rlimit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/xfs_log_rlimit.c index 2af1a0a4d0f1..ee7e0e80246b 100644 --- a/fs/xfs/xfs_log_rlimit.c +++ b/fs/xfs/xfs_log_rlimit.c @@ -42,7 +42,7 @@ xfs_log_calc_max_attrsetm_res( int size; int nblks; - size = xfs_attr_leaf_entsize_local_max(mp->m_sb.sb_blocksize) - + size = xfs_attr_leaf_entsize_local_max(mp->m_attr_geo->blksize) - MAXNAMELEN - 1; nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); nblks += XFS_B_TO_FSB(mp, size); |