Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 124783
b: refs/heads/master
c: e99ab90
h: refs/heads/master
i:
  124781: 6f5cf7f
  124779: c597675
  124775: 218532d
  124767: 7a7ef9b
v: v3
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Oct 30, 2008
1 parent 14da98d commit dcf66d0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8186e517fab1854554c48955cdbcbb6710e7baef
refs/heads/master: e99ab90d6a9e8ac92f05d2c31d44aa7feee15394
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_bmap_btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2656,7 +2656,7 @@ xfs_bmbt_init_cursor(
cur->bc_blocklog = mp->m_sb.sb_blocklog;

cur->bc_ops = &xfs_bmbt_ops;
cur->bc_flags = XFS_BTREE_ROOT_IN_INODE;
cur->bc_flags = XFS_BTREE_LONG_PTRS | XFS_BTREE_ROOT_IN_INODE;

cur->bc_private.b.forksize = XFS_IFORK_SIZE(ip, whichfork);
cur->bc_private.b.ip = ip;
Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/xfs/xfs_btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ xfs_btree_check_block(
int level, /* level of the btree block */
xfs_buf_t *bp) /* buffer containing block, if any */
{
if (XFS_BTREE_LONG_PTRS(cur->bc_btnum))
if (cur->bc_flags & XFS_BTREE_LONG_PTRS)
xfs_btree_check_lblock(cur, (xfs_btree_lblock_t *)block, level,
bp);
else
Expand Down Expand Up @@ -516,7 +516,7 @@ xfs_btree_islastblock(

block = xfs_btree_get_block(cur, level, &bp);
xfs_btree_check_block(cur, block, level, bp);
if (XFS_BTREE_LONG_PTRS(cur->bc_btnum))
if (cur->bc_flags & XFS_BTREE_LONG_PTRS)
return be64_to_cpu(block->bb_u.l.bb_rightsib) == NULLDFSBNO;
else
return be32_to_cpu(block->bb_u.s.bb_rightsib) == NULLAGBLOCK;
Expand Down Expand Up @@ -808,7 +808,7 @@ xfs_btree_setbuf(
if (!bp)
return;
b = XFS_BUF_TO_BLOCK(bp);
if (XFS_BTREE_LONG_PTRS(cur->bc_btnum)) {
if (cur->bc_flags & XFS_BTREE_LONG_PTRS) {
if (be64_to_cpu(b->bb_u.l.bb_leftsib) == NULLDFSBNO)
cur->bc_ra[lev] |= XFS_BTCUR_LEFTRA;
if (be64_to_cpu(b->bb_u.l.bb_rightsib) == NULLDFSBNO)
Expand Down
6 changes: 1 addition & 5 deletions trunk/fs/xfs/xfs_btree.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ union xfs_btree_rec {
#define XFS_BB_NUM_BITS 5
#define XFS_BB_ALL_BITS ((1 << XFS_BB_NUM_BITS) - 1)

/*
* Boolean to select which form of xfs_btree_block_t.bb_u to use.
*/
#define XFS_BTREE_LONG_PTRS(btnum) ((btnum) == XFS_BTNUM_BMAP)

/*
* Magic numbers for btree blocks.
*/
Expand Down Expand Up @@ -203,6 +198,7 @@ typedef struct xfs_btree_cur
} xfs_btree_cur_t;

/* cursor flags */
#define XFS_BTREE_LONG_PTRS (1<<0) /* pointers are 64bits long */
#define XFS_BTREE_ROOT_IN_INODE (1<<1) /* root may be variable size */


Expand Down

0 comments on commit dcf66d0

Please sign in to comment.