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_log_format.h | |
| 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_log_format.h')
| -rw-r--r-- | fs/xfs/libxfs/xfs_log_format.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index 083cdd6d6c28..7ae571f8e34a 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h @@ -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 */ |