redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

libxfs: convert ushort to unsigned short

Browse source 
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>
This commit is contained in:
Darrick J. Wong 2016-11-08 11:55:48 +11:00 committed by Dave Chinner
parent b77428b12b
commit 755c7bf5dd
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/xfs/libxfs/xfs_ialloc.c
View file

@ -2344,7 +2344,8 @@ xfs_imap(
imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, agbno); imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, agbno);
imap->im_len = XFS_FSB_TO_BB(mp, 1); 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; return 0;
} }
@ -2372,7 +2373,7 @@ out_map:
imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, cluster_agbno); imap->im_blkno = XFS_AGB_TO_DADDR(mp, agno, cluster_agbno);
imap->im_len = XFS_FSB_TO_BB(mp, blks_per_cluster); 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 * If the inode number maps to a block outside the bounds

4
fs/xfs/libxfs/xfs_inode_buf.h
View file

@ -58,8 +58,8 @@ struct xfs_icdinode {
*/ */
struct xfs_imap { struct xfs_imap {
xfs_daddr_t im_blkno; /* starting BB of inode chunk */ xfs_daddr_t im_blkno; /* starting BB of inode chunk */
ushort im_len; /* length in BBs of inode chunk */ unsigned short im_len; /* length in BBs of inode chunk */
ushort im_boffset; /* inode offset in block in bytes */ unsigned short im_boffset; /* inode offset in block in bytes */
}; };
int xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *, int xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,

4
fs/xfs/libxfs/xfs_log_format.h
View file

@ -481,8 +481,8 @@ static inline uint xfs_log_dinode_size(int version)
typedef struct xfs_buf_log_format { typedef struct xfs_buf_log_format {
unsigned short blf_type; /* buf log item type indicator */ unsigned short blf_type; /* buf log item type indicator */
unsigned short blf_size; /* size of this item */ unsigned short blf_size; /* size of this item */
ushort blf_flags; /* misc state */ unsigned short blf_flags; /* misc state */
ushort blf_len; /* number of blocks in this buf */ unsigned short blf_len; /* number of blocks in this buf */
__int64_t blf_blkno; /* starting blkno of 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_map_size; /* used size of data bitmap in words */
unsigned int blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */ unsigned int blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */

2
fs/xfs/libxfs/xfs_log_recover.h
View file

@ -52,7 +52,7 @@ typedef struct xlog_recover {
struct list_head r_itemq; /* q for items */ struct list_head r_itemq; /* q for items */
} xlog_recover_t; } 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 * This is the number of entries in the l_buf_cancel_table used during

4
fs/xfs/xfs_log_recover.c
View file

@ -2025,7 +2025,7 @@ xlog_peek_buffer_cancelled(
struct xlog *log, struct xlog *log,
xfs_daddr_t blkno, xfs_daddr_t blkno,
uint len, uint len,
ushort flags) unsigned short flags)
{ {
struct list_head *bucket; struct list_head *bucket;
struct xfs_buf_cancel *bcp; struct xfs_buf_cancel *bcp;
@ -2065,7 +2065,7 @@ xlog_check_buffer_cancelled(
struct xlog *log, struct xlog *log,
xfs_daddr_t blkno, xfs_daddr_t blkno,
uint len, uint len,
ushort flags) unsigned short flags)
{ {
struct xfs_buf_cancel *bcp; struct xfs_buf_cancel *bcp;