Commit 755c7bf5 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

libxfs: convert ushort to unsigned short 



Since xfsprogs dropped ushort in favor of unsigned short, do that
here too.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent b77428b1

fs/xfs/libxfs/xfs_ialloc.c

+3 −2
Original line number Diff line number Diff line
@@ -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 @@ xfs_imap( 


	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

fs/xfs/libxfs/xfs_inode_buf.h

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ struct xfs_icdinode { 
 */

struct xfs_imap {

	xfs_daddr_t	im_blkno;	/* starting BB of inode chunk */

	ushort		im_len;		/* length in BBs of inode chunk */

	ushort		im_boffset;	/* inode offset in block in bytes */

	unsigned short	im_len;		/* length in BBs of inode chunk */

	unsigned short	im_boffset;	/* inode offset in block in bytes */

};



int	xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,

fs/xfs/libxfs/xfs_log_format.h

+2 −2
Original line number Diff line number Diff line
@@ -481,8 +481,8 @@ static inline uint xfs_log_dinode_size(int version) 
typedef struct xfs_buf_log_format {

	unsigned short	blf_type;	/* buf log item type indicator */

	unsigned short	blf_size;	/* size of this item */

	ushort		blf_flags;	/* misc state */

	ushort		blf_len;	/* number of blocks in this buf */

	unsigned short	blf_flags;	/* misc state */

	unsigned short	blf_len;	/* number of blocks in this buf */

	__int64_t	blf_blkno;	/* starting blkno of this buf */

	unsigned int	blf_map_size;	/* used size of data bitmap in words */

	unsigned int	blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */

fs/xfs/libxfs/xfs_log_recover.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ typedef struct xlog_recover { 
	struct list_head	r_itemq;	/* q for items */

} xlog_recover_t;



#define ITEM_TYPE(i)	(*(ushort *)(i)->ri_buf[0].i_addr)

#define ITEM_TYPE(i)	(*(unsigned short *)(i)->ri_buf[0].i_addr)



/*

 * This is the number of entries in the l_buf_cancel_table used during

fs/xfs/xfs_log_recover.c

+2 −2
Original line number Diff line number Diff line
@@ -2025,7 +2025,7 @@ xlog_peek_buffer_cancelled( 
	struct xlog		*log,

	xfs_daddr_t		blkno,

	uint			len,

	ushort			flags)

	unsigned short			flags)

{

	struct list_head	*bucket;

	struct xfs_buf_cancel	*bcp;
@@ -2065,7 +2065,7 @@ xlog_check_buffer_cancelled( 
	struct xlog		*log,

	xfs_daddr_t		blkno,

	uint			len,

	ushort			flags)

	unsigned short			flags)

{

	struct xfs_buf_cancel	*bcp;