diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-11-10 10:29:29 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-11-10 10:29:29 +1100 |
| commit | 8f23d318aa746ea0680637a535606637a19073db (patch) | |
| tree | fd90df17569f5b11b4a672fdcb4c57a0d51c655a /fs/xfs/libxfs/xfs_ialloc.c | |
| parent | b649c42e25b7d1be86d9dade8674dec3d64138fb (diff) | |
| parent | bec9d48d7a303a5bb95c05961ff07ec7eeb59058 (diff) | |
Merge branch 'xfs-4.10-libxfs-cleanups' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_ialloc.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 51b4e0de1fdc..c507c1b17ca1 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2344,7 +2344,8 @@ xfs_imap( imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, agbno); imap->im_len = XFS_FSB_TO_BB(mp, 1); - imap->im_boffset = (ushort)(offset << mp->m_sb.sb_inodelog); + imap->im_boffset = (unsigned short)(offset << + mp->m_sb.sb_inodelog); return 0; } @@ -2372,7 +2373,7 @@ out_map: imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, cluster_agbno); imap->im_len = XFS_FSB_TO_BB(mp, blks_per_cluster); - imap->im_boffset = (ushort)(offset << mp->m_sb.sb_inodelog); + imap->im_boffset = (unsigned short)(offset << mp->m_sb.sb_inodelog); /* * If the inode number maps to a block outside the bounds |