diff options
| author | Darrick J. Wong | 2016-11-08 01:55:48 +0100 |
|---|---|---|
| committer | Dave Chinner | 2016-11-08 01:55:48 +0100 |
| commit | 755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2 (patch) | |
| tree | 8edbf0b365e367fc04bf794a9a25287139c386b5 /fs/xfs/xfs_log_recover.c | |
| parent | xfs: defer should abort intent items if the trans roll fails (diff) | |
| download | kernel-qcow2-linux-755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2.tar.gz kernel-qcow2-linux-755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2.tar.xz kernel-qcow2-linux-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/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 9b3d7c76915d..cf754bcbcb1c 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -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; |