xfs: Use xfs_icluster_size_fsb() to calculate inode alignment mask
commit d5825712ee
upstream.
When block size is larger than inode cluster size, the call to
XFS_B_TO_FSBT(mp, mp->m_inode_cluster_size) returns 0. Also, mkfs.xfs
would have set xfs_sb->sb_inoalignmt to 0. Hence in
xfs_set_inoalignment(), xfs_mount->m_inoalign_mask gets initialized to
-1 instead of 0. However, xfs_mount->m_sinoalign would get correctly
intialized to 0 because for every positive value of xfs_mount->m_dalign,
the condition "!(mp->m_dalign & mp->m_inoalign_mask)" would evaluate to
false.
Also, xfs_imap() worked fine even with xfs_mount->m_inoalign_mask having
-1 as the value because blks_per_cluster variable would have the value 1
and hence we would never have a need to use xfs_mount->m_inoalign_mask
to compute the inode chunk's agbno and offset within the chunk.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d07b5855ab
commit
77aedb0cbe
|
@ -502,8 +502,7 @@ STATIC void
|
||||||
xfs_set_inoalignment(xfs_mount_t *mp)
|
xfs_set_inoalignment(xfs_mount_t *mp)
|
||||||
{
|
{
|
||||||
if (xfs_sb_version_hasalign(&mp->m_sb) &&
|
if (xfs_sb_version_hasalign(&mp->m_sb) &&
|
||||||
mp->m_sb.sb_inoalignmt >=
|
mp->m_sb.sb_inoalignmt >= xfs_icluster_size_fsb(mp))
|
||||||
XFS_B_TO_FSBT(mp, mp->m_inode_cluster_size))
|
|
||||||
mp->m_inoalign_mask = mp->m_sb.sb_inoalignmt - 1;
|
mp->m_inoalign_mask = mp->m_sb.sb_inoalignmt - 1;
|
||||||
else
|
else
|
||||||
mp->m_inoalign_mask = 0;
|
mp->m_inoalign_mask = 0;
|
||||||
|
|
Loading…
Reference in a new issue