diff options
| author |   Darrick J. Wong <darrick.wong@oracle.com> | 2016-11-08 11:55:48 +1100 |
|---|---|---|
| committer |   Dave Chinner <david@fromorbit.com> | 2016-11-08 11:55:48 +1100 |
| commit | 755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2 (patch) | |
| tree | 8edbf0b365e367fc04bf794a9a25287139c386b5 /fs/xfs/libxfs/xfs_ialloc.c | |
| parent | xfs: defer should abort intent items if the trans roll fails (diff) | |
| download | linux-dev-755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2.tar.xz linux-dev-755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2.zip | |
libxfs: convert ushort to unsigned short
Since xfsprogs dropped ushort in favor of unsigned short, do that
here too.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
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 |