Skip to content

L
linux
Commit fd12985b authored by Nathan Scott's avatar Nathan Scott
Browse files
Options

[XFS] Fix compile error with XFS_BIG_FILESYSTEMS set. 

SGI Modid: 2.5.x-xfs:slinx:131618a
parent cfb315eb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/xfs/xfs_bmap_btree.c
View file @ fd12985b
...@@ -1874,7 +1874,7 @@ xfs_bmbt_delete( ...@@ -1874,7 +1874,7 @@ xfs_bmbt_delete(
* xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state. * xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state.
*/ */
static __inline__ void STATIC __inline__ void
__xfs_bmbt_get_all( __xfs_bmbt_get_all(
__uint64_t l0, __uint64_t l0,
__uint64_t l1, __uint64_t l1,
...@@ -2514,10 +2514,10 @@ xfs_bmbt_set_allf( ...@@ -2514,10 +2514,10 @@ xfs_bmbt_set_allf(
#if XFS_BIG_FILESYSTEMS #if XFS_BIG_FILESYSTEMS
r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) | r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) |
((xfs_bmbt_rec_base_t)o << 9) | ((xfs_bmbt_rec_base_t)o << 9) |
((xfs_bmbt_rec_base_t)b >> 43)); ((xfs_bmbt_rec_base_t)b >> 43);
r->l1 = ((xfs_bmbt_rec_base_t)b << 21) | r->l1 = ((xfs_bmbt_rec_base_t)b << 21) |
((xfs_bmbt_rec_base_t)c & ((xfs_bmbt_rec_base_t)c &
(xfs_bmbt_rec_base_t)XFS_MASK64LO(21))); (xfs_bmbt_rec_base_t)XFS_MASK64LO(21));
#else /* !XFS_BIG_FILESYSTEMS */ #else /* !XFS_BIG_FILESYSTEMS */
if (ISNULLSTARTBLOCK(b)) { if (ISNULLSTARTBLOCK(b)) {
r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) | r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7