microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[XFS] Endianess annotations for various allocator data structures 

SGI-PV: 943272
SGI-Modid: xfs-linux:xfs-kern:201006a

Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
This commit is contained in:
Christoph Hellwig 2005-11-02 15:11:25 +11:00 коммит произвёл Nathan Scott
Родитель e2ed81fbbb
Коммит 16259e7d95
16 изменённых файлов: 793 добавлений и 810 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

58
fs/xfs/xfs_ag.h
Просмотреть файл

@ -48,27 +48,26 @@ struct xfs_trans;
* are > 64k, our value cannot be confused for an EFS superblock's. * are > 64k, our value cannot be confused for an EFS superblock's.
*/ */
typedef struct xfs_agf typedef struct xfs_agf {
{
/* /*
* Common allocation group header information * Common allocation group header information
*/ */
__uint32_t agf_magicnum; /* magic number == XFS_AGF_MAGIC */ __be32 agf_magicnum; /* magic number == XFS_AGF_MAGIC */
__uint32_t agf_versionnum; /* header version == XFS_AGF_VERSION */ __be32 agf_versionnum; /* header version == XFS_AGF_VERSION */
xfs_agnumber_t agf_seqno; /* sequence # starting from 0 */ __be32 agf_seqno; /* sequence # starting from 0 */
xfs_agblock_t agf_length; /* size in blocks of a.g. */ __be32 agf_length; /* size in blocks of a.g. */
/* /*
* Freespace information * Freespace information
*/ */
xfs_agblock_t agf_roots[XFS_BTNUM_AGF]; /* root blocks */ __be32 agf_roots[XFS_BTNUM_AGF]; /* root blocks */
__uint32_t agf_spare0; /* spare field */ __be32 agf_spare0; /* spare field */
__uint32_t agf_levels[XFS_BTNUM_AGF]; /* btree levels */ __be32 agf_levels[XFS_BTNUM_AGF]; /* btree levels */
__uint32_t agf_spare1; /* spare field */ __be32 agf_spare1; /* spare field */
__uint32_t agf_flfirst; /* first freelist block's index */ __be32 agf_flfirst; /* first freelist block's index */
__uint32_t agf_fllast; /* last freelist block's index */ __be32 agf_fllast; /* last freelist block's index */
__uint32_t agf_flcount; /* count of blocks in freelist */ __be32 agf_flcount; /* count of blocks in freelist */
xfs_extlen_t agf_freeblks; /* total free blocks */ __be32 agf_freeblks; /* total free blocks */
xfs_extlen_t agf_longest; /* longest free space */ __be32 agf_longest; /* longest free space */
} xfs_agf_t; } xfs_agf_t;
#define XFS_AGF_MAGICNUM 0x00000001 #define XFS_AGF_MAGICNUM 0x00000001
@ -96,31 +95,30 @@ typedef struct xfs_agf
*/ */
#define XFS_AGI_UNLINKED_BUCKETS 64 #define XFS_AGI_UNLINKED_BUCKETS 64
typedef struct xfs_agi typedef struct xfs_agi {
{
/* /*
* Common allocation group header information * Common allocation group header information
*/ */
__uint32_t agi_magicnum; /* magic number == XFS_AGI_MAGIC */ __be32 agi_magicnum; /* magic number == XFS_AGI_MAGIC */
__uint32_t agi_versionnum; /* header version == XFS_AGI_VERSION */ __be32 agi_versionnum; /* header version == XFS_AGI_VERSION */
xfs_agnumber_t agi_seqno; /* sequence # starting from 0 */ __be32 agi_seqno; /* sequence # starting from 0 */
xfs_agblock_t agi_length; /* size in blocks of a.g. */ __be32 agi_length; /* size in blocks of a.g. */
/* /*
* Inode information * Inode information
* Inodes are mapped by interpreting the inode number, so no * Inodes are mapped by interpreting the inode number, so no
* mapping data is needed here. * mapping data is needed here.
*/ */
xfs_agino_t agi_count; /* count of allocated inodes */ __be32 agi_count; /* count of allocated inodes */
xfs_agblock_t agi_root; /* root of inode btree */ __be32 agi_root; /* root of inode btree */
__uint32_t agi_level; /* levels in inode btree */ __be32 agi_level; /* levels in inode btree */
xfs_agino_t agi_freecount; /* number of free inodes */ __be32 agi_freecount; /* number of free inodes */
xfs_agino_t agi_newino; /* new inode just allocated */ __be32 agi_newino; /* new inode just allocated */
xfs_agino_t agi_dirino; /* last directory inode chunk */ __be32 agi_dirino; /* last directory inode chunk */
/* /*
* Hash table of inodes which have been unlinked but are * Hash table of inodes which have been unlinked but are
* still being referenced. * still being referenced.
*/ */
xfs_agino_t agi_unlinked[XFS_AGI_UNLINKED_BUCKETS]; __be32 agi_unlinked[XFS_AGI_UNLINKED_BUCKETS];
} xfs_agi_t; } xfs_agi_t;
#define XFS_AGI_MAGICNUM 0x00000001 #define XFS_AGI_MAGICNUM 0x00000001
@ -201,8 +199,8 @@ typedef struct xfs_perag
(MIN(bl + 1, XFS_AG_MAXLEVELS(mp)) + MIN(cl + 1, XFS_AG_MAXLEVELS(mp))) (MIN(bl + 1, XFS_AG_MAXLEVELS(mp)) + MIN(cl + 1, XFS_AG_MAXLEVELS(mp)))
#define XFS_MIN_FREELIST(a,mp) \ #define XFS_MIN_FREELIST(a,mp) \
(XFS_MIN_FREELIST_RAW( \ (XFS_MIN_FREELIST_RAW( \
INT_GET((a)->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT), \ be32_to_cpu((a)->agf_levels[XFS_BTNUM_BNOi]), \
INT_GET((a)->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT), mp)) be32_to_cpu((a)->agf_levels[XFS_BTNUM_CNTi]), mp))
#define XFS_MIN_FREELIST_PAG(pag,mp) \ #define XFS_MIN_FREELIST_PAG(pag,mp) \
(XFS_MIN_FREELIST_RAW( \ (XFS_MIN_FREELIST_RAW( \
(uint_t)(pag)->pagf_levels[XFS_BTNUM_BNOi], \ (uint_t)(pag)->pagf_levels[XFS_BTNUM_BNOi], \

146
fs/xfs/xfs_alloc.c
Просмотреть файл

@ -231,8 +231,8 @@ xfs_alloc_fix_minleft(
if (args->minleft == 0) if (args->minleft == 0)
return 1; return 1;
agf = XFS_BUF_TO_AGF(args->agbp); agf = XFS_BUF_TO_AGF(args->agbp);
diff = INT_GET(agf->agf_freeblks, ARCH_CONVERT) diff = be32_to_cpu(agf->agf_freeblks)
+ INT_GET(agf->agf_flcount, ARCH_CONVERT) + be32_to_cpu(agf->agf_flcount)
- args->len - args->minleft; - args->len - args->minleft;
if (diff >= 0) if (diff >= 0)
return 1; return 1;
@ -307,7 +307,8 @@ xfs_alloc_fixup_trees(
bnoblock = XFS_BUF_TO_ALLOC_BLOCK(bno_cur->bc_bufs[0]); bnoblock = XFS_BUF_TO_ALLOC_BLOCK(bno_cur->bc_bufs[0]);
cntblock = XFS_BUF_TO_ALLOC_BLOCK(cnt_cur->bc_bufs[0]); cntblock = XFS_BUF_TO_ALLOC_BLOCK(cnt_cur->bc_bufs[0]);
XFS_WANT_CORRUPTED_RETURN( XFS_WANT_CORRUPTED_RETURN(
INT_GET(bnoblock->bb_numrecs, ARCH_CONVERT) == INT_GET(cntblock->bb_numrecs, ARCH_CONVERT)); be16_to_cpu(bnoblock->bb_numrecs) ==
be16_to_cpu(cntblock->bb_numrecs));
} }
} }
#endif #endif
@ -493,21 +494,17 @@ xfs_alloc_trace_modagf(
(void *)str, (void *)str,
(void *)mp, (void *)mp,
(void *)(__psint_t)flags, (void *)(__psint_t)flags,
(void *)(__psunsigned_t)INT_GET(agf->agf_seqno, ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_seqno),
(void *)(__psunsigned_t)INT_GET(agf->agf_length, ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_length),
(void *)(__psunsigned_t)INT_GET(agf->agf_roots[XFS_BTNUM_BNO], (void *)(__psunsigned_t)be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
(void *)(__psunsigned_t)INT_GET(agf->agf_roots[XFS_BTNUM_CNT], (void *)(__psunsigned_t)be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
(void *)(__psunsigned_t)INT_GET(agf->agf_levels[XFS_BTNUM_BNO], (void *)(__psunsigned_t)be32_to_cpu(agf->agf_flfirst),
ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_fllast),
(void *)(__psunsigned_t)INT_GET(agf->agf_levels[XFS_BTNUM_CNT], (void *)(__psunsigned_t)be32_to_cpu(agf->agf_flcount),
ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_freeblks),
(void *)(__psunsigned_t)INT_GET(agf->agf_flfirst, ARCH_CONVERT), (void *)(__psunsigned_t)be32_to_cpu(agf->agf_longest));
(void *)(__psunsigned_t)INT_GET(agf->agf_fllast, ARCH_CONVERT),
(void *)(__psunsigned_t)INT_GET(agf->agf_flcount, ARCH_CONVERT),
(void *)(__psunsigned_t)INT_GET(agf->agf_freeblks, ARCH_CONVERT),
(void *)(__psunsigned_t)INT_GET(agf->agf_longest, ARCH_CONVERT));
} }
STATIC void STATIC void
@ -600,12 +597,12 @@ xfs_alloc_ag_vextent(
if (!(args->wasfromfl)) { if (!(args->wasfromfl)) {
agf = XFS_BUF_TO_AGF(args->agbp); agf = XFS_BUF_TO_AGF(args->agbp);
INT_MOD(agf->agf_freeblks, ARCH_CONVERT, -(args->len)); be32_add(&agf->agf_freeblks, -(args->len));
xfs_trans_agblocks_delta(args->tp, xfs_trans_agblocks_delta(args->tp,
-((long)(args->len))); -((long)(args->len)));
args->pag->pagf_freeblks -= args->len; args->pag->pagf_freeblks -= args->len;
ASSERT(INT_GET(agf->agf_freeblks, ARCH_CONVERT) ASSERT(be32_to_cpu(agf->agf_freeblks) <=
<= INT_GET(agf->agf_length, ARCH_CONVERT)); be32_to_cpu(agf->agf_length));
TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS); TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS);
xfs_alloc_log_agf(args->tp, args->agbp, xfs_alloc_log_agf(args->tp, args->agbp,
XFS_AGF_FREEBLKS); XFS_AGF_FREEBLKS);
@ -711,8 +708,7 @@ xfs_alloc_ag_vextent_exact(
cnt_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp, cnt_cur = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,
args->agno, XFS_BTNUM_CNT, NULL, 0); args->agno, XFS_BTNUM_CNT, NULL, 0);
ASSERT(args->agbno + args->len <= ASSERT(args->agbno + args->len <=
INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length, be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
ARCH_CONVERT));
if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen, if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen,
args->agbno, args->len, XFSA_FIXUP_BNO_OK))) { args->agbno, args->len, XFSA_FIXUP_BNO_OK))) {
xfs_btree_del_cursor(cnt_cur, XFS_BTREE_ERROR); xfs_btree_del_cursor(cnt_cur, XFS_BTREE_ERROR);
@ -885,8 +881,7 @@ xfs_alloc_ag_vextent_near(
goto error0; goto error0;
XFS_WANT_CORRUPTED_GOTO(i == 1, error0); XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
ltend = ltbno + ltlen; ltend = ltbno + ltlen;
ASSERT(ltend <= INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length, ASSERT(ltend <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
ARCH_CONVERT));
args->len = blen; args->len = blen;
if (!xfs_alloc_fix_minleft(args)) { if (!xfs_alloc_fix_minleft(args)) {
xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR); xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
@ -1241,8 +1236,7 @@ xfs_alloc_ag_vextent_near(
ltlen, &ltnew); ltlen, &ltnew);
ASSERT(ltnew >= ltbno); ASSERT(ltnew >= ltbno);
ASSERT(ltnew + rlen <= ltend); ASSERT(ltnew + rlen <= ltend);
ASSERT(ltnew + rlen <= INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length, ASSERT(ltnew + rlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
ARCH_CONVERT));
args->agbno = ltnew; args->agbno = ltnew;
if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen, if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen,
ltnew, rlen, XFSA_FIXUP_BNO_OK))) ltnew, rlen, XFSA_FIXUP_BNO_OK)))
@ -1405,8 +1399,7 @@ xfs_alloc_ag_vextent_size(
args->agbno = rbno; args->agbno = rbno;
XFS_WANT_CORRUPTED_GOTO( XFS_WANT_CORRUPTED_GOTO(
args->agbno + args->len <= args->agbno + args->len <=
INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length, be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
ARCH_CONVERT),
error0); error0);
TRACE_ALLOC("normal", args); TRACE_ALLOC("normal", args);
return 0; return 0;
@ -1454,8 +1447,8 @@ xfs_alloc_ag_vextent_small(
* freelist. * freelist.
*/ */
else if (args->minlen == 1 && args->alignment == 1 && !args->isfl && else if (args->minlen == 1 && args->alignment == 1 && !args->isfl &&
(INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_flcount, (be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_flcount)
ARCH_CONVERT) > args->minleft)) { > args->minleft)) {
if ((error = xfs_alloc_get_freelist(args->tp, args->agbp, &fbno))) if ((error = xfs_alloc_get_freelist(args->tp, args->agbp, &fbno)))
goto error0; goto error0;
if (fbno != NULLAGBLOCK) { if (fbno != NULLAGBLOCK) {
@ -1470,8 +1463,7 @@ xfs_alloc_ag_vextent_small(
args->agbno = fbno; args->agbno = fbno;
XFS_WANT_CORRUPTED_GOTO( XFS_WANT_CORRUPTED_GOTO(
args->agbno + args->len <= args->agbno + args->len <=
INT_GET(XFS_BUF_TO_AGF(args->agbp)->agf_length, be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
ARCH_CONVERT),
error0); error0);
args->wasfromfl = 1; args->wasfromfl = 1;
TRACE_ALLOC("freelist", args); TRACE_ALLOC("freelist", args);
@ -1745,12 +1737,12 @@ xfs_free_ag_extent(
agf = XFS_BUF_TO_AGF(agbp); agf = XFS_BUF_TO_AGF(agbp);
pag = &mp->m_perag[agno]; pag = &mp->m_perag[agno];
INT_MOD(agf->agf_freeblks, ARCH_CONVERT, len); be32_add(&agf->agf_freeblks, len);
xfs_trans_agblocks_delta(tp, len); xfs_trans_agblocks_delta(tp, len);
pag->pagf_freeblks += len; pag->pagf_freeblks += len;
XFS_WANT_CORRUPTED_GOTO( XFS_WANT_CORRUPTED_GOTO(
INT_GET(agf->agf_freeblks, ARCH_CONVERT) be32_to_cpu(agf->agf_freeblks) <=
<= INT_GET(agf->agf_length, ARCH_CONVERT), be32_to_cpu(agf->agf_length),
error0); error0);
TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS); TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS);
xfs_alloc_log_agf(tp, agbp, XFS_AGF_FREEBLKS); xfs_alloc_log_agf(tp, agbp, XFS_AGF_FREEBLKS);
@ -1897,18 +1889,18 @@ xfs_alloc_fix_freelist(
*/ */
agf = XFS_BUF_TO_AGF(agbp); agf = XFS_BUF_TO_AGF(agbp);
need = XFS_MIN_FREELIST(agf, mp); need = XFS_MIN_FREELIST(agf, mp);
delta = need > INT_GET(agf->agf_flcount, ARCH_CONVERT) ? delta = need > be32_to_cpu(agf->agf_flcount) ?
(need - INT_GET(agf->agf_flcount, ARCH_CONVERT)) : 0; (need - be32_to_cpu(agf->agf_flcount)) : 0;
/* /*
* If there isn't enough total or single-extent, reject it. * If there isn't enough total or single-extent, reject it.
*/ */
longest = INT_GET(agf->agf_longest, ARCH_CONVERT); longest = be32_to_cpu(agf->agf_longest);
longest = (longest > delta) ? (longest - delta) : longest = (longest > delta) ? (longest - delta) :
(INT_GET(agf->agf_flcount, ARCH_CONVERT) > 0 || longest > 0); (be32_to_cpu(agf->agf_flcount) > 0 || longest > 0);
if (args->minlen + args->alignment + args->minalignslop - 1 > longest || if (args->minlen + args->alignment + args->minalignslop - 1 > longest ||
(args->minleft && (args->minleft &&
(int)(INT_GET(agf->agf_freeblks, ARCH_CONVERT) + (int)(be32_to_cpu(agf->agf_freeblks) +
INT_GET(agf->agf_flcount, ARCH_CONVERT) - need - args->total) < be32_to_cpu(agf->agf_flcount) - need - args->total) <
(int)args->minleft)) { (int)args->minleft)) {
xfs_trans_brelse(tp, agbp); xfs_trans_brelse(tp, agbp);
args->agbp = NULL; args->agbp = NULL;
@ -1917,7 +1909,7 @@ xfs_alloc_fix_freelist(
/* /*
* Make the freelist shorter if it's too long. * Make the freelist shorter if it's too long.
*/ */
while (INT_GET(agf->agf_flcount, ARCH_CONVERT) > need) { while (be32_to_cpu(agf->agf_flcount) > need) {
xfs_buf_t *bp; xfs_buf_t *bp;
if ((error = xfs_alloc_get_freelist(tp, agbp, &bno))) if ((error = xfs_alloc_get_freelist(tp, agbp, &bno)))
@ -1944,9 +1936,9 @@ xfs_alloc_fix_freelist(
/* /*
* Make the freelist longer if it's too short. * Make the freelist longer if it's too short.
*/ */
while (INT_GET(agf->agf_flcount, ARCH_CONVERT) < need) { while (be32_to_cpu(agf->agf_flcount) < need) {
targs.agbno = 0; targs.agbno = 0;
targs.maxlen = need - INT_GET(agf->agf_flcount, ARCH_CONVERT); targs.maxlen = need - be32_to_cpu(agf->agf_flcount);
/* /*
* Allocate as many blocks as possible at once. * Allocate as many blocks as possible at once.
*/ */
@ -2006,19 +1998,19 @@ xfs_alloc_get_freelist(
*/ */
mp = tp->t_mountp; mp = tp->t_mountp;
if ((error = xfs_alloc_read_agfl(mp, tp, if ((error = xfs_alloc_read_agfl(mp, tp,
INT_GET(agf->agf_seqno, ARCH_CONVERT), &agflbp))) be32_to_cpu(agf->agf_seqno), &agflbp)))
return error; return error;
agfl = XFS_BUF_TO_AGFL(agflbp); agfl = XFS_BUF_TO_AGFL(agflbp);
/* /*
* Get the block number and update the data structures. * Get the block number and update the data structures.
*/ */
bno = INT_GET(agfl->agfl_bno[INT_GET(agf->agf_flfirst, ARCH_CONVERT)], ARCH_CONVERT); bno = INT_GET(agfl->agfl_bno[be32_to_cpu(agf->agf_flfirst)], ARCH_CONVERT);
INT_MOD(agf->agf_flfirst, ARCH_CONVERT, 1); be32_add(&agf->agf_flfirst, 1);
xfs_trans_brelse(tp, agflbp); xfs_trans_brelse(tp, agflbp);
if (INT_GET(agf->agf_flfirst, ARCH_CONVERT) == XFS_AGFL_SIZE(mp)) if (be32_to_cpu(agf->agf_flfirst) == XFS_AGFL_SIZE(mp))
agf->agf_flfirst = 0; agf->agf_flfirst = 0;
pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)]; pag = &mp->m_perag[be32_to_cpu(agf->agf_seqno)];
INT_MOD(agf->agf_flcount, ARCH_CONVERT, -1); be32_add(&agf->agf_flcount, -1);
xfs_trans_agflist_delta(tp, -1); xfs_trans_agflist_delta(tp, -1);
pag->pagf_flcount--; pag->pagf_flcount--;
TRACE_MODAGF(NULL, agf, XFS_AGF_FLFIRST | XFS_AGF_FLCOUNT); TRACE_MODAGF(NULL, agf, XFS_AGF_FLFIRST | XFS_AGF_FLCOUNT);
@ -2033,7 +2025,7 @@ xfs_alloc_get_freelist(
* the freeing transaction must be pushed to disk NOW by forcing * the freeing transaction must be pushed to disk NOW by forcing
* to disk all iclogs up that transaction's LSN. * to disk all iclogs up that transaction's LSN.
*/ */
xfs_alloc_search_busy(tp, INT_GET(agf->agf_seqno, ARCH_CONVERT), bno, 1); xfs_alloc_search_busy(tp, be32_to_cpu(agf->agf_seqno), bno, 1);
return 0; return 0;
} }
@ -2111,18 +2103,18 @@ xfs_alloc_put_freelist(
mp = tp->t_mountp; mp = tp->t_mountp;
if (!agflbp && (error = xfs_alloc_read_agfl(mp, tp, if (!agflbp && (error = xfs_alloc_read_agfl(mp, tp,
INT_GET(agf->agf_seqno, ARCH_CONVERT), &agflbp))) be32_to_cpu(agf->agf_seqno), &agflbp)))
return error; return error;
agfl = XFS_BUF_TO_AGFL(agflbp); agfl = XFS_BUF_TO_AGFL(agflbp);
INT_MOD(agf->agf_fllast, ARCH_CONVERT, 1); be32_add(&agf->agf_fllast, 1);
if (INT_GET(agf->agf_fllast, ARCH_CONVERT) == XFS_AGFL_SIZE(mp)) if (be32_to_cpu(agf->agf_fllast) == XFS_AGFL_SIZE(mp))
agf->agf_fllast = 0; agf->agf_fllast = 0;
pag = &mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)]; pag = &mp->m_perag[be32_to_cpu(agf->agf_seqno)];
INT_MOD(agf->agf_flcount, ARCH_CONVERT, 1); be32_add(&agf->agf_flcount, 1);
xfs_trans_agflist_delta(tp, 1); xfs_trans_agflist_delta(tp, 1);
pag->pagf_flcount++; pag->pagf_flcount++;
ASSERT(INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE(mp)); ASSERT(be32_to_cpu(agf->agf_flcount) <= XFS_AGFL_SIZE(mp));
blockp = &agfl->agfl_bno[INT_GET(agf->agf_fllast, ARCH_CONVERT)]; blockp = &agfl->agfl_bno[be32_to_cpu(agf->agf_fllast)];
INT_SET(*blockp, ARCH_CONVERT, bno); INT_SET(*blockp, ARCH_CONVERT, bno);
TRACE_MODAGF(NULL, agf, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT); TRACE_MODAGF(NULL, agf, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT);
xfs_alloc_log_agf(tp, agbp, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT); xfs_alloc_log_agf(tp, agbp, XFS_AGF_FLLAST | XFS_AGF_FLCOUNT);
@ -2169,14 +2161,12 @@ xfs_alloc_read_agf(
*/ */
agf = XFS_BUF_TO_AGF(bp); agf = XFS_BUF_TO_AGF(bp);
agf_ok = agf_ok =
INT_GET(agf->agf_magicnum, ARCH_CONVERT) == XFS_AGF_MAGIC && be32_to_cpu(agf->agf_magicnum) == XFS_AGF_MAGIC &&
XFS_AGF_GOOD_VERSION( XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&
INT_GET(agf->agf_versionnum, ARCH_CONVERT)) && be32_to_cpu(agf->agf_freeblks) <= be32_to_cpu(agf->agf_length) &&
INT_GET(agf->agf_freeblks, ARCH_CONVERT) <= be32_to_cpu(agf->agf_flfirst) < XFS_AGFL_SIZE(mp) &&
INT_GET(agf->agf_length, ARCH_CONVERT) && be32_to_cpu(agf->agf_fllast) < XFS_AGFL_SIZE(mp) &&
INT_GET(agf->agf_flfirst, ARCH_CONVERT) < XFS_AGFL_SIZE(mp) && be32_to_cpu(agf->agf_flcount) <= XFS_AGFL_SIZE(mp);
INT_GET(agf->agf_fllast, ARCH_CONVERT) < XFS_AGFL_SIZE(mp) &&
INT_GET(agf->agf_flcount, ARCH_CONVERT) <= XFS_AGFL_SIZE(mp);
if (unlikely(XFS_TEST_ERROR(!agf_ok, mp, XFS_ERRTAG_ALLOC_READ_AGF, if (unlikely(XFS_TEST_ERROR(!agf_ok, mp, XFS_ERRTAG_ALLOC_READ_AGF,
XFS_RANDOM_ALLOC_READ_AGF))) { XFS_RANDOM_ALLOC_READ_AGF))) {
XFS_CORRUPTION_ERROR("xfs_alloc_read_agf", XFS_CORRUPTION_ERROR("xfs_alloc_read_agf",
@ -2186,13 +2176,13 @@ xfs_alloc_read_agf(
} }
pag = &mp->m_perag[agno]; pag = &mp->m_perag[agno];
if (!pag->pagf_init) { if (!pag->pagf_init) {
pag->pagf_freeblks = INT_GET(agf->agf_freeblks, ARCH_CONVERT); pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks);
pag->pagf_flcount = INT_GET(agf->agf_flcount, ARCH_CONVERT); pag->pagf_flcount = be32_to_cpu(agf->agf_flcount);
pag->pagf_longest = INT_GET(agf->agf_longest, ARCH_CONVERT); pag->pagf_longest = be32_to_cpu(agf->agf_longest);
pag->pagf_levels[XFS_BTNUM_BNOi] = pag->pagf_levels[XFS_BTNUM_BNOi] =
INT_GET(agf->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT); be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]);
pag->pagf_levels[XFS_BTNUM_CNTi] = pag->pagf_levels[XFS_BTNUM_CNTi] =
INT_GET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT); be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]);
spinlock_init(&pag->pagb_lock, "xfspagb"); spinlock_init(&pag->pagb_lock, "xfspagb");
pag->pagb_list = kmem_zalloc(XFS_PAGB_NUM_SLOTS * pag->pagb_list = kmem_zalloc(XFS_PAGB_NUM_SLOTS *
sizeof(xfs_perag_busy_t), KM_SLEEP); sizeof(xfs_perag_busy_t), KM_SLEEP);
@ -2200,13 +2190,13 @@ xfs_alloc_read_agf(
} }
#ifdef DEBUG #ifdef DEBUG
else if (!XFS_FORCED_SHUTDOWN(mp)) { else if (!XFS_FORCED_SHUTDOWN(mp)) {
ASSERT(pag->pagf_freeblks == INT_GET(agf->agf_freeblks, ARCH_CONVERT)); ASSERT(pag->pagf_freeblks == be32_to_cpu(agf->agf_freeblks));
ASSERT(pag->pagf_flcount == INT_GET(agf->agf_flcount, ARCH_CONVERT)); ASSERT(pag->pagf_flcount == be32_to_cpu(agf->agf_flcount));
ASSERT(pag->pagf_longest == INT_GET(agf->agf_longest, ARCH_CONVERT)); ASSERT(pag->pagf_longest == be32_to_cpu(agf->agf_longest));
ASSERT(pag->pagf_levels[XFS_BTNUM_BNOi] == ASSERT(pag->pagf_levels[XFS_BTNUM_BNOi] ==
INT_GET(agf->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT)); be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]));
ASSERT(pag->pagf_levels[XFS_BTNUM_CNTi] == ASSERT(pag->pagf_levels[XFS_BTNUM_CNTi] ==
INT_GET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT)); be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]));
} }
#endif #endif
XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGF, XFS_AGF_REF); XFS_BUF_SET_VTYPE_REF(bp, B_FS_AGF, XFS_AGF_REF);
@ -2455,7 +2445,7 @@ xfs_free_extent(
#ifdef DEBUG #ifdef DEBUG
ASSERT(args.agbp != NULL); ASSERT(args.agbp != NULL);
agf = XFS_BUF_TO_AGF(args.agbp); agf = XFS_BUF_TO_AGF(args.agbp);
ASSERT(args.agbno + len <= INT_GET(agf->agf_length, ARCH_CONVERT)); ASSERT(args.agbno + len <= be32_to_cpu(agf->agf_length));
#endif #endif
error = xfs_free_ag_extent(tp, args.agbp, args.agno, args.agbno, error = xfs_free_ag_extent(tp, args.agbp, args.agno, args.agbno,
len, 0); len, 0);

413
fs/xfs/xfs_alloc_btree.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

17
fs/xfs/xfs_alloc_btree.h
Просмотреть файл

@ -38,14 +38,19 @@ struct xfs_mount;
/* /*
* Data record/key structure * Data record/key structure
*/ */
typedef struct xfs_alloc_rec typedef struct xfs_alloc_rec {
{ __be32 ar_startblock; /* starting block number */
xfs_agblock_t ar_startblock; /* starting block number */ __be32 ar_blockcount; /* count of free blocks */
xfs_extlen_t ar_blockcount; /* count of free blocks */
} xfs_alloc_rec_t, xfs_alloc_key_t; } xfs_alloc_rec_t, xfs_alloc_key_t;
typedef xfs_agblock_t xfs_alloc_ptr_t; /* btree pointer type */ typedef struct xfs_alloc_rec_incore {
/* btree block header type */ xfs_agblock_t ar_startblock; /* starting block number */
xfs_extlen_t ar_blockcount; /* count of free blocks */
} xfs_alloc_rec_incore_t;
/* btree pointer type */
typedef __be32 xfs_alloc_ptr_t;
/* btree block header type */
typedef struct xfs_btree_sblock xfs_alloc_block_t; typedef struct xfs_btree_sblock xfs_alloc_block_t;
#define XFS_BUF_TO_ALLOC_BLOCK(bp) ((xfs_alloc_block_t *)XFS_BUF_PTR(bp)) #define XFS_BUF_TO_ALLOC_BLOCK(bp) ((xfs_alloc_block_t *)XFS_BUF_PTR(bp))

62
fs/xfs/xfs_bmap.c
Просмотреть файл

@ -2763,8 +2763,8 @@ xfs_bmap_btree_to_extents(
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(ifp->if_flags & XFS_IFEXTENTS);
ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE); ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE);
rblock = ifp->if_broot; rblock = ifp->if_broot;
ASSERT(INT_GET(rblock->bb_level, ARCH_CONVERT) == 1); ASSERT(be16_to_cpu(rblock->bb_level) == 1);
ASSERT(INT_GET(rblock->bb_numrecs, ARCH_CONVERT) == 1); ASSERT(be16_to_cpu(rblock->bb_numrecs) == 1);
ASSERT(XFS_BMAP_BROOT_MAXRECS(ifp->if_broot_bytes) == 1); ASSERT(XFS_BMAP_BROOT_MAXRECS(ifp->if_broot_bytes) == 1);
mp = ip->i_mount; mp = ip->i_mount;
pp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, ifp->if_broot_bytes); pp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, ifp->if_broot_bytes);
@ -3207,11 +3207,11 @@ xfs_bmap_extents_to_btree(
* Fill in the root. * Fill in the root.
*/ */
block = ifp->if_broot; block = ifp->if_broot;
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_BMAP_MAGIC); block->bb_magic = cpu_to_be32(XFS_BMAP_MAGIC);
INT_SET(block->bb_level, ARCH_CONVERT, 1); block->bb_level = cpu_to_be16(1);
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); block->bb_numrecs = cpu_to_be16(1);
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLDFSBNO); block->bb_leftsib = cpu_to_be64(NULLDFSBNO);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLDFSBNO); block->bb_rightsib = cpu_to_be64(NULLDFSBNO);
/* /*
* Need a cursor. Can't allocate until bb_level is filled in. * Need a cursor. Can't allocate until bb_level is filled in.
*/ */
@ -3264,10 +3264,10 @@ xfs_bmap_extents_to_btree(
* Fill in the child block. * Fill in the child block.
*/ */
ablock = XFS_BUF_TO_BMBT_BLOCK(abp); ablock = XFS_BUF_TO_BMBT_BLOCK(abp);
INT_SET(ablock->bb_magic, ARCH_CONVERT, XFS_BMAP_MAGIC); ablock->bb_magic = cpu_to_be32(XFS_BMAP_MAGIC);
ablock->bb_level = 0; ablock->bb_level = 0;
INT_SET(ablock->bb_leftsib, ARCH_CONVERT, NULLDFSBNO); ablock->bb_leftsib = cpu_to_be64(NULLDFSBNO);
INT_SET(ablock->bb_rightsib, ARCH_CONVERT, NULLDFSBNO); ablock->bb_rightsib = cpu_to_be64(NULLDFSBNO);
arp = XFS_BMAP_REC_IADDR(ablock, 1, cur); arp = XFS_BMAP_REC_IADDR(ablock, 1, cur);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
for (ep = ifp->if_u1.if_extents, cnt = i = 0; i < nextents; i++, ep++) { for (ep = ifp->if_u1.if_extents, cnt = i = 0; i < nextents; i++, ep++) {
@ -3277,8 +3277,8 @@ xfs_bmap_extents_to_btree(
arp++; cnt++; arp++; cnt++;
} }
} }
INT_SET(ablock->bb_numrecs, ARCH_CONVERT, cnt); ASSERT(cnt == XFS_IFORK_NEXTENTS(ip, whichfork));
ASSERT(INT_GET(ablock->bb_numrecs, ARCH_CONVERT) == XFS_IFORK_NEXTENTS(ip, whichfork)); ablock->bb_numrecs = cpu_to_be16(cnt);
/* /*
* Fill in the root key and pointer. * Fill in the root key and pointer.
*/ */
@ -3292,7 +3292,7 @@ xfs_bmap_extents_to_btree(
* the root is at the right level. * the root is at the right level.
*/ */
xfs_bmbt_log_block(cur, abp, XFS_BB_ALL_BITS); xfs_bmbt_log_block(cur, abp, XFS_BB_ALL_BITS);
xfs_bmbt_log_recs(cur, abp, 1, INT_GET(ablock->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_recs(cur, abp, 1, be16_to_cpu(ablock->bb_numrecs));
ASSERT(*curp == NULL); ASSERT(*curp == NULL);
*curp = cur; *curp = cur;
*logflagsp = XFS_ILOG_CORE | XFS_ILOG_FBROOT(whichfork); *logflagsp = XFS_ILOG_CORE | XFS_ILOG_FBROOT(whichfork);
@ -4371,8 +4371,8 @@ xfs_bmap_read_extents(
/* /*
* Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out. * Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out.
*/ */
ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0); level = be16_to_cpu(block->bb_level);
level = INT_GET(block->bb_level, ARCH_CONVERT); ASSERT(level > 0);
pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes); pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes);
ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO); ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO);
ASSERT(XFS_FSB_TO_AGNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agcount); ASSERT(XFS_FSB_TO_AGNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agcount);
@ -4415,7 +4415,7 @@ xfs_bmap_read_extents(
xfs_extnum_t num_recs; xfs_extnum_t num_recs;
num_recs = INT_GET(block->bb_numrecs, ARCH_CONVERT); num_recs = be16_to_cpu(block->bb_numrecs);
if (unlikely(i + num_recs > room)) { if (unlikely(i + num_recs > room)) {
ASSERT(i + num_recs <= room); ASSERT(i + num_recs <= room);
xfs_fs_cmn_err(CE_WARN, ip->i_mount, xfs_fs_cmn_err(CE_WARN, ip->i_mount,
@ -4432,7 +4432,7 @@ xfs_bmap_read_extents(
/* /*
* Read-ahead the next leaf block, if any. * Read-ahead the next leaf block, if any.
*/ */
nextbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); nextbno = be64_to_cpu(block->bb_rightsib);
if (nextbno != NULLFSBLOCK) if (nextbno != NULLFSBLOCK)
xfs_btree_reada_bufl(mp, nextbno, 1); xfs_btree_reada_bufl(mp, nextbno, 1);
/* /*
@ -4689,7 +4689,7 @@ xfs_bmapi(
} }
if (wr && *firstblock == NULLFSBLOCK) { if (wr && *firstblock == NULLFSBLOCK) {
if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE) if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE)
minleft = INT_GET(ifp->if_broot->bb_level, ARCH_CONVERT) + 1; minleft = be16_to_cpu(ifp->if_broot->bb_level) + 1;
else else
minleft = 1; minleft = 1;
} else } else
@ -5967,10 +5967,10 @@ xfs_check_block(
xfs_bmbt_ptr_t *pp, *thispa; /* pointer to block address */ xfs_bmbt_ptr_t *pp, *thispa; /* pointer to block address */
xfs_bmbt_key_t *prevp, *keyp; xfs_bmbt_key_t *prevp, *keyp;
ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0); ASSERT(be16_to_cpu(block->bb_level) > 0);
prevp = NULL; prevp = NULL;
for( i = 1; i <= INT_GET(block->bb_numrecs, ARCH_CONVERT);i++) { for( i = 1; i <= be16_to_cpu(block->bb_numrecs); i++) {
dmxr = mp->m_bmap_dmxr[0]; dmxr = mp->m_bmap_dmxr[0];
if (root) { if (root) {
@ -5995,7 +5995,7 @@ xfs_check_block(
pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize, pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize,
xfs_bmbt, block, i, dmxr); xfs_bmbt, block, i, dmxr);
} }
for (j = i+1; j <= INT_GET(block->bb_numrecs, ARCH_CONVERT); j++) { for (j = i+1; j <= be16_to_cpu(block->bb_numrecs); j++) {
if (root) { if (root) {
thispa = XFS_BMAP_BROOT_PTR_ADDR(block, j, sz); thispa = XFS_BMAP_BROOT_PTR_ADDR(block, j, sz);
} else { } else {
@ -6048,8 +6048,8 @@ xfs_bmap_check_leaf_extents(
/* /*
* Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out. * Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out.
*/ */
ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0); level = be16_to_cpu(block->bb_level);
level = INT_GET(block->bb_level, ARCH_CONVERT); ASSERT(level > 0);
xfs_check_block(block, mp, 1, ifp->if_broot_bytes); xfs_check_block(block, mp, 1, ifp->if_broot_bytes);
pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes); pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes);
ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO); ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO);
@ -6109,13 +6109,13 @@ xfs_bmap_check_leaf_extents(
xfs_extnum_t num_recs; xfs_extnum_t num_recs;
num_recs = INT_GET(block->bb_numrecs, ARCH_CONVERT); num_recs = be16_to_cpu(block->bb_numrecs);
/* /*
* Read-ahead the next leaf block, if any. * Read-ahead the next leaf block, if any.
*/ */
nextbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); nextbno = be64_to_cpu(block->bb_rightsib);
/* /*
* Check all the extents to make sure they are OK. * Check all the extents to make sure they are OK.
@ -6212,8 +6212,8 @@ xfs_bmap_count_blocks(
* Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out. * Root level must use BMAP_BROOT_PTR_ADDR macro to get ptr out.
*/ */
block = ifp->if_broot; block = ifp->if_broot;
ASSERT(INT_GET(block->bb_level, ARCH_CONVERT) > 0); level = be16_to_cpu(block->bb_level);
level = INT_GET(block->bb_level, ARCH_CONVERT); ASSERT(level > 0);
pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes); pp = XFS_BMAP_BROOT_PTR_ADDR(block, 1, ifp->if_broot_bytes);
ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO); ASSERT(INT_GET(*pp, ARCH_CONVERT) != NULLDFSBNO);
ASSERT(XFS_FSB_TO_AGNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agcount); ASSERT(XFS_FSB_TO_AGNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agcount);
@ -6258,14 +6258,14 @@ xfs_bmap_count_tree(
if (--level) { if (--level) {
/* Not at node above leafs, count this level of nodes */ /* Not at node above leafs, count this level of nodes */
nextbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); nextbno = be64_to_cpu(block->bb_rightsib);
while (nextbno != NULLFSBLOCK) { while (nextbno != NULLFSBLOCK) {
if ((error = xfs_btree_read_bufl(mp, tp, nextbno, if ((error = xfs_btree_read_bufl(mp, tp, nextbno,
0, &nbp, XFS_BMAP_BTREE_REF))) 0, &nbp, XFS_BMAP_BTREE_REF)))
return error; return error;
*count += 1; *count += 1;
nextblock = XFS_BUF_TO_BMBT_BLOCK(nbp); nextblock = XFS_BUF_TO_BMBT_BLOCK(nbp);
nextbno = INT_GET(nextblock->bb_rightsib, ARCH_CONVERT); nextbno = be64_to_cpu(nextblock->bb_rightsib);
xfs_trans_brelse(tp, nbp); xfs_trans_brelse(tp, nbp);
} }
@ -6284,8 +6284,8 @@ xfs_bmap_count_tree(
} else { } else {
/* count all level 1 nodes and their leaves */ /* count all level 1 nodes and their leaves */
for (;;) { for (;;) {
nextbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); nextbno = be64_to_cpu(block->bb_rightsib);
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize,
xfs_bmbt, block, 1, mp->m_bmap_dmxr[0]); xfs_bmbt, block, 1, mp->m_bmap_dmxr[0]);
if (unlikely(xfs_bmap_disk_count_leaves(frp, numrecs, count) < 0)) { if (unlikely(xfs_bmap_disk_count_leaves(frp, numrecs, count) < 0)) {

230
fs/xfs/xfs_bmap_btree.c
Просмотреть файл

@ -366,7 +366,7 @@ xfs_bmbt_delrec(
return 0; return 0;
} }
block = xfs_bmbt_get_block(cur, level, &bp); block = xfs_bmbt_get_block(cur, level, &bp);
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_lblock(cur, block, level, bp))) { if ((error = xfs_btree_check_lblock(cur, block, level, bp))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
@ -411,7 +411,7 @@ xfs_bmbt_delrec(
} }
} }
numrecs--; numrecs--;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_bmbt_log_block(cur, bp, XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, bp, XFS_BB_NUMRECS);
/* /*
* We're at the root level. * We're at the root level.
@ -447,8 +447,8 @@ xfs_bmbt_delrec(
*stat = 1; *stat = 1;
return 0; return 0;
} }
rbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); rbno = be64_to_cpu(block->bb_rightsib);
lbno = INT_GET(block->bb_leftsib, ARCH_CONVERT); lbno = be64_to_cpu(block->bb_leftsib);
/* /*
* One child of root, need to get a chance to copy its contents * One child of root, need to get a chance to copy its contents
* into the root and delete it. Can't go up to next level, * into the root and delete it. Can't go up to next level,
@ -492,15 +492,15 @@ xfs_bmbt_delrec(
goto error0; goto error0;
} }
#endif #endif
bno = INT_GET(right->bb_leftsib, ARCH_CONVERT); bno = be64_to_cpu(right->bb_leftsib);
if (INT_GET(right->bb_numrecs, ARCH_CONVERT) - 1 >= if (be16_to_cpu(right->bb_numrecs) - 1 >=
XFS_BMAP_BLOCK_IMINRECS(level, cur)) { XFS_BMAP_BLOCK_IMINRECS(level, cur)) {
if ((error = xfs_bmbt_lshift(tcur, level, &i))) { if ((error = xfs_bmbt_lshift(tcur, level, &i))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
goto error0; goto error0;
} }
if (i) { if (i) {
ASSERT(INT_GET(block->bb_numrecs, ARCH_CONVERT) >= ASSERT(be16_to_cpu(block->bb_numrecs) >=
XFS_BMAP_BLOCK_IMINRECS(level, tcur)); XFS_BMAP_BLOCK_IMINRECS(level, tcur));
xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR); xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);
tcur = NULL; tcur = NULL;
@ -517,7 +517,7 @@ xfs_bmbt_delrec(
return 0; return 0;
} }
} }
rrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT); rrecs = be16_to_cpu(right->bb_numrecs);
if (lbno != NULLFSBLOCK) { if (lbno != NULLFSBLOCK) {
i = xfs_btree_firstrec(tcur, level); i = xfs_btree_firstrec(tcur, level);
XFS_WANT_CORRUPTED_GOTO(i == 1, error0); XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
@ -548,15 +548,15 @@ xfs_bmbt_delrec(
goto error0; goto error0;
} }
#endif #endif
bno = INT_GET(left->bb_rightsib, ARCH_CONVERT); bno = be64_to_cpu(left->bb_rightsib);
if (INT_GET(left->bb_numrecs, ARCH_CONVERT) - 1 >= if (be16_to_cpu(left->bb_numrecs) - 1 >=
XFS_BMAP_BLOCK_IMINRECS(level, cur)) { XFS_BMAP_BLOCK_IMINRECS(level, cur)) {
if ((error = xfs_bmbt_rshift(tcur, level, &i))) { if ((error = xfs_bmbt_rshift(tcur, level, &i))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
goto error0; goto error0;
} }
if (i) { if (i) {
ASSERT(INT_GET(block->bb_numrecs, ARCH_CONVERT) >= ASSERT(be16_to_cpu(block->bb_numrecs) >=
XFS_BMAP_BLOCK_IMINRECS(level, tcur)); XFS_BMAP_BLOCK_IMINRECS(level, tcur));
xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR); xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);
tcur = NULL; tcur = NULL;
@ -567,14 +567,14 @@ xfs_bmbt_delrec(
return 0; return 0;
} }
} }
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); lrecs = be16_to_cpu(left->bb_numrecs);
} }
xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR); xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);
tcur = NULL; tcur = NULL;
mp = cur->bc_mp; mp = cur->bc_mp;
ASSERT(bno != NULLFSBLOCK); ASSERT(bno != NULLFSBLOCK);
if (lbno != NULLFSBLOCK && if (lbno != NULLFSBLOCK &&
lrecs + INT_GET(block->bb_numrecs, ARCH_CONVERT) <= XFS_BMAP_BLOCK_IMAXRECS(level, cur)) { lrecs + be16_to_cpu(block->bb_numrecs) <= XFS_BMAP_BLOCK_IMAXRECS(level, cur)) {
rbno = bno; rbno = bno;
right = block; right = block;
rbp = bp; rbp = bp;
@ -589,7 +589,7 @@ xfs_bmbt_delrec(
goto error0; goto error0;
} }
} else if (rbno != NULLFSBLOCK && } else if (rbno != NULLFSBLOCK &&
rrecs + INT_GET(block->bb_numrecs, ARCH_CONVERT) <= rrecs + be16_to_cpu(block->bb_numrecs) <=
XFS_BMAP_BLOCK_IMAXRECS(level, cur)) { XFS_BMAP_BLOCK_IMAXRECS(level, cur)) {
lbno = bno; lbno = bno;
left = block; left = block;
@ -604,7 +604,7 @@ xfs_bmbt_delrec(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
goto error0; goto error0;
} }
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); lrecs = be16_to_cpu(left->bb_numrecs);
} else { } else {
if (level > 0 && (error = xfs_bmbt_decrement(cur, level, &i))) { if (level > 0 && (error = xfs_bmbt_decrement(cur, level, &i))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
@ -614,8 +614,8 @@ xfs_bmbt_delrec(
*stat = 1; *stat = 1;
return 0; return 0;
} }
numlrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); numlrecs = be16_to_cpu(left->bb_numrecs);
numrrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT); numrrecs = be16_to_cpu(right->bb_numrecs);
if (level > 0) { if (level > 0) {
lkp = XFS_BMAP_KEY_IADDR(left, numlrecs + 1, cur); lkp = XFS_BMAP_KEY_IADDR(left, numlrecs + 1, cur);
lpp = XFS_BMAP_PTR_IADDR(left, numlrecs + 1, cur); lpp = XFS_BMAP_PTR_IADDR(left, numlrecs + 1, cur);
@ -639,12 +639,12 @@ xfs_bmbt_delrec(
memcpy(lrp, rrp, numrrecs * sizeof(*lrp)); memcpy(lrp, rrp, numrrecs * sizeof(*lrp));
xfs_bmbt_log_recs(cur, lbp, numlrecs + 1, numlrecs + numrrecs); xfs_bmbt_log_recs(cur, lbp, numlrecs + 1, numlrecs + numrrecs);
} }
INT_MOD(left->bb_numrecs, ARCH_CONVERT, numrrecs); be16_add(&left->bb_numrecs, numrrecs);
left->bb_rightsib = right->bb_rightsib; /* INT_: direct copy */ left->bb_rightsib = right->bb_rightsib;
xfs_bmbt_log_block(cur, lbp, XFS_BB_RIGHTSIB | XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, lbp, XFS_BB_RIGHTSIB | XFS_BB_NUMRECS);
if (INT_GET(left->bb_rightsib, ARCH_CONVERT) != NULLDFSBNO) { if (be64_to_cpu(left->bb_rightsib) != NULLDFSBNO) {
if ((error = xfs_btree_read_bufl(mp, cur->bc_tp, if ((error = xfs_btree_read_bufl(mp, cur->bc_tp,
INT_GET(left->bb_rightsib, ARCH_CONVERT), be64_to_cpu(left->bb_rightsib),
0, &rrbp, XFS_BMAP_BTREE_REF))) { 0, &rrbp, XFS_BMAP_BTREE_REF))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
goto error0; goto error0;
@ -654,7 +654,7 @@ xfs_bmbt_delrec(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
goto error0; goto error0;
} }
INT_SET(rrblock->bb_leftsib, ARCH_CONVERT, lbno); rrblock->bb_leftsib = cpu_to_be64(lbno);
xfs_bmbt_log_block(cur, rrbp, XFS_BB_LEFTSIB); xfs_bmbt_log_block(cur, rrbp, XFS_BB_LEFTSIB);
} }
xfs_bmap_add_free(XFS_DADDR_TO_FSB(mp, XFS_BUF_ADDR(rbp)), 1, xfs_bmap_add_free(XFS_DADDR_TO_FSB(mp, XFS_BUF_ADDR(rbp)), 1,
@ -711,7 +711,7 @@ xfs_bmbt_get_rec(
if ((error = xfs_btree_check_lblock(cur, block, 0, bp))) if ((error = xfs_btree_check_lblock(cur, block, 0, bp)))
return error; return error;
#endif #endif
if (ptr > INT_GET(block->bb_numrecs, ARCH_CONVERT) || ptr <= 0) { if (ptr > be16_to_cpu(block->bb_numrecs) || ptr <= 0) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -772,7 +772,7 @@ xfs_bmbt_insrec(
} }
XFS_STATS_INC(xs_bmbt_insrec); XFS_STATS_INC(xs_bmbt_insrec);
block = xfs_bmbt_get_block(cur, level, &bp); block = xfs_bmbt_get_block(cur, level, &bp);
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_lblock(cur, block, level, bp))) { if ((error = xfs_btree_check_lblock(cur, block, level, bp))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
@ -854,7 +854,7 @@ xfs_bmbt_insrec(
} }
} }
} }
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
if (level > 0) { if (level > 0) {
kp = XFS_BMAP_KEY_IADDR(block, 1, cur); kp = XFS_BMAP_KEY_IADDR(block, 1, cur);
pp = XFS_BMAP_PTR_IADDR(block, 1, cur); pp = XFS_BMAP_PTR_IADDR(block, 1, cur);
@ -881,7 +881,7 @@ xfs_bmbt_insrec(
kp[ptr - 1] = key; kp[ptr - 1] = key;
INT_SET(pp[ptr - 1], ARCH_CONVERT, *bnop); INT_SET(pp[ptr - 1], ARCH_CONVERT, *bnop);
numrecs++; numrecs++;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_bmbt_log_keys(cur, bp, ptr, numrecs); xfs_bmbt_log_keys(cur, bp, ptr, numrecs);
xfs_bmbt_log_ptrs(cur, bp, ptr, numrecs); xfs_bmbt_log_ptrs(cur, bp, ptr, numrecs);
} else { } else {
@ -890,7 +890,7 @@ xfs_bmbt_insrec(
(numrecs - ptr + 1) * sizeof(*rp)); (numrecs - ptr + 1) * sizeof(*rp));
rp[ptr - 1] = *recp; rp[ptr - 1] = *recp;
numrecs++; numrecs++;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_bmbt_log_recs(cur, bp, ptr, numrecs); xfs_bmbt_log_recs(cur, bp, ptr, numrecs);
} }
xfs_bmbt_log_block(cur, bp, XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, bp, XFS_BB_NUMRECS);
@ -955,7 +955,7 @@ xfs_bmbt_killroot(
/* /*
* Give up if the root has multiple children. * Give up if the root has multiple children.
*/ */
if (INT_GET(block->bb_numrecs, ARCH_CONVERT) != 1) { if (be16_to_cpu(block->bb_numrecs) != 1) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
return 0; return 0;
} }
@ -966,37 +966,37 @@ xfs_bmbt_killroot(
*/ */
cbp = cur->bc_bufs[level - 1]; cbp = cur->bc_bufs[level - 1];
cblock = XFS_BUF_TO_BMBT_BLOCK(cbp); cblock = XFS_BUF_TO_BMBT_BLOCK(cbp);
if (INT_GET(cblock->bb_numrecs, ARCH_CONVERT) > XFS_BMAP_BLOCK_DMAXRECS(level, cur)) { if (be16_to_cpu(cblock->bb_numrecs) > XFS_BMAP_BLOCK_DMAXRECS(level, cur)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
return 0; return 0;
} }
ASSERT(INT_GET(cblock->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO); ASSERT(be64_to_cpu(cblock->bb_leftsib) == NULLDFSBNO);
ASSERT(INT_GET(cblock->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO); ASSERT(be64_to_cpu(cblock->bb_rightsib) == NULLDFSBNO);
ip = cur->bc_private.b.ip; ip = cur->bc_private.b.ip;
ifp = XFS_IFORK_PTR(ip, cur->bc_private.b.whichfork); ifp = XFS_IFORK_PTR(ip, cur->bc_private.b.whichfork);
ASSERT(XFS_BMAP_BLOCK_IMAXRECS(level, cur) == ASSERT(XFS_BMAP_BLOCK_IMAXRECS(level, cur) ==
XFS_BMAP_BROOT_MAXRECS(ifp->if_broot_bytes)); XFS_BMAP_BROOT_MAXRECS(ifp->if_broot_bytes));
i = (int)(INT_GET(cblock->bb_numrecs, ARCH_CONVERT) - XFS_BMAP_BLOCK_IMAXRECS(level, cur)); i = (int)(be16_to_cpu(cblock->bb_numrecs) - XFS_BMAP_BLOCK_IMAXRECS(level, cur));
if (i) { if (i) {
xfs_iroot_realloc(ip, i, cur->bc_private.b.whichfork); xfs_iroot_realloc(ip, i, cur->bc_private.b.whichfork);
block = ifp->if_broot; block = ifp->if_broot;
} }
INT_MOD(block->bb_numrecs, ARCH_CONVERT, i); be16_add(&block->bb_numrecs, i);
ASSERT(INT_GET(block->bb_numrecs, ARCH_CONVERT) == INT_GET(cblock->bb_numrecs, ARCH_CONVERT)); ASSERT(block->bb_numrecs == cblock->bb_numrecs);
kp = XFS_BMAP_KEY_IADDR(block, 1, cur); kp = XFS_BMAP_KEY_IADDR(block, 1, cur);
ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur); ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur);
memcpy(kp, ckp, INT_GET(block->bb_numrecs, ARCH_CONVERT) * sizeof(*kp)); memcpy(kp, ckp, be16_to_cpu(block->bb_numrecs) * sizeof(*kp));
pp = XFS_BMAP_PTR_IADDR(block, 1, cur); pp = XFS_BMAP_PTR_IADDR(block, 1, cur);
cpp = XFS_BMAP_PTR_IADDR(cblock, 1, cur); cpp = XFS_BMAP_PTR_IADDR(cblock, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < INT_GET(cblock->bb_numrecs, ARCH_CONVERT); i++) { for (i = 0; i < be16_to_cpu(cblock->bb_numrecs); i++) {
if ((error = xfs_btree_check_lptr(cur, INT_GET(cpp[i], ARCH_CONVERT), level - 1))) { if ((error = xfs_btree_check_lptr(cur, INT_GET(cpp[i], ARCH_CONVERT), level - 1))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
} }
#endif #endif
memcpy(pp, cpp, INT_GET(block->bb_numrecs, ARCH_CONVERT) * sizeof(*pp)); memcpy(pp, cpp, be16_to_cpu(block->bb_numrecs) * sizeof(*pp));
xfs_bmap_add_free(XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(cbp)), 1, xfs_bmap_add_free(XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(cbp)), 1,
cur->bc_private.b.flist, cur->bc_mp); cur->bc_private.b.flist, cur->bc_mp);
ip->i_d.di_nblocks--; ip->i_d.di_nblocks--;
@ -1004,7 +1004,7 @@ xfs_bmbt_killroot(
XFS_TRANS_DQ_BCOUNT, -1L); XFS_TRANS_DQ_BCOUNT, -1L);
xfs_trans_binval(cur->bc_tp, cbp); xfs_trans_binval(cur->bc_tp, cbp);
cur->bc_bufs[level - 1] = NULL; cur->bc_bufs[level - 1] = NULL;
INT_MOD(block->bb_level, ARCH_CONVERT, -1); be16_add(&block->bb_level, -1);
xfs_trans_log_inode(cur->bc_tp, ip, xfs_trans_log_inode(cur->bc_tp, ip,
XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork)); XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork));
cur->bc_nlevels--; cur->bc_nlevels--;
@ -1160,7 +1160,7 @@ xfs_bmbt_lookup(
else else
krbase = XFS_BMAP_REC_IADDR(block, 1, cur); krbase = XFS_BMAP_REC_IADDR(block, 1, cur);
low = 1; low = 1;
if (!(high = INT_GET(block->bb_numrecs, ARCH_CONVERT))) { if (!(high = be16_to_cpu(block->bb_numrecs))) {
ASSERT(level == 0); ASSERT(level == 0);
cur->bc_ptrs[0] = dir != XFS_LOOKUP_LE; cur->bc_ptrs[0] = dir != XFS_LOOKUP_LE;
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
@ -1207,8 +1207,8 @@ xfs_bmbt_lookup(
* If ge search and we went off the end of the block, but it's * If ge search and we went off the end of the block, but it's
* not the last block, we're in the wrong block. * not the last block, we're in the wrong block.
*/ */
if (dir == XFS_LOOKUP_GE && keyno > INT_GET(block->bb_numrecs, ARCH_CONVERT) && if (dir == XFS_LOOKUP_GE && keyno > be16_to_cpu(block->bb_numrecs) &&
INT_GET(block->bb_rightsib, ARCH_CONVERT) != NULLDFSBNO) { be64_to_cpu(block->bb_rightsib) != NULLDFSBNO) {
cur->bc_ptrs[0] = keyno; cur->bc_ptrs[0] = keyno;
if ((error = xfs_bmbt_increment(cur, 0, &i))) { if ((error = xfs_bmbt_increment(cur, 0, &i))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
@ -1223,7 +1223,7 @@ xfs_bmbt_lookup(
else if (dir == XFS_LOOKUP_LE && diff > 0) else if (dir == XFS_LOOKUP_LE && diff > 0)
keyno--; keyno--;
cur->bc_ptrs[0] = keyno; cur->bc_ptrs[0] = keyno;
if (keyno == 0 || keyno > INT_GET(block->bb_numrecs, ARCH_CONVERT)) { if (keyno == 0 || keyno > be16_to_cpu(block->bb_numrecs)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
} else { } else {
@ -1280,7 +1280,7 @@ xfs_bmbt_lshift(
return error; return error;
} }
#endif #endif
if (INT_GET(right->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO) { if (be64_to_cpu(right->bb_leftsib) == NULLDFSBNO) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
@ -1291,7 +1291,7 @@ xfs_bmbt_lshift(
return 0; return 0;
} }
mp = cur->bc_mp; mp = cur->bc_mp;
if ((error = xfs_btree_read_bufl(mp, cur->bc_tp, INT_GET(right->bb_leftsib, ARCH_CONVERT), 0, if ((error = xfs_btree_read_bufl(mp, cur->bc_tp, be64_to_cpu(right->bb_leftsib), 0,
&lbp, XFS_BMAP_BTREE_REF))) { &lbp, XFS_BMAP_BTREE_REF))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
@ -1301,12 +1301,12 @@ xfs_bmbt_lshift(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
if (INT_GET(left->bb_numrecs, ARCH_CONVERT) == XFS_BMAP_BLOCK_IMAXRECS(level, cur)) { if (be16_to_cpu(left->bb_numrecs) == XFS_BMAP_BLOCK_IMAXRECS(level, cur)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
} }
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT) + 1; lrecs = be16_to_cpu(left->bb_numrecs) + 1;
if (level > 0) { if (level > 0) {
lkp = XFS_BMAP_KEY_IADDR(left, lrecs, cur); lkp = XFS_BMAP_KEY_IADDR(left, lrecs, cur);
rkp = XFS_BMAP_KEY_IADDR(right, 1, cur); rkp = XFS_BMAP_KEY_IADDR(right, 1, cur);
@ -1328,7 +1328,7 @@ xfs_bmbt_lshift(
*lrp = *rrp; *lrp = *rrp;
xfs_bmbt_log_recs(cur, lbp, lrecs, lrecs); xfs_bmbt_log_recs(cur, lbp, lrecs, lrecs);
} }
INT_SET(left->bb_numrecs, ARCH_CONVERT, lrecs); left->bb_numrecs = cpu_to_be16(lrecs);
xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS);
#ifdef DEBUG #ifdef DEBUG
if (level > 0) if (level > 0)
@ -1336,8 +1336,8 @@ xfs_bmbt_lshift(
else else
xfs_btree_check_rec(XFS_BTNUM_BMAP, lrp - 1, lrp); xfs_btree_check_rec(XFS_BTNUM_BMAP, lrp - 1, lrp);
#endif #endif
rrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT) - 1; rrecs = be16_to_cpu(right->bb_numrecs) - 1;
INT_SET(right->bb_numrecs, ARCH_CONVERT, rrecs); right->bb_numrecs = cpu_to_be16(rrecs);
xfs_bmbt_log_block(cur, rbp, XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, rbp, XFS_BB_NUMRECS);
if (level > 0) { if (level > 0) {
#ifdef DEBUG #ifdef DEBUG
@ -1414,18 +1414,18 @@ xfs_bmbt_rshift(
return error; return error;
} }
#endif #endif
if (INT_GET(left->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO) { if (be64_to_cpu(left->bb_rightsib) == NULLDFSBNO) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
} }
if (cur->bc_ptrs[level] >= INT_GET(left->bb_numrecs, ARCH_CONVERT)) { if (cur->bc_ptrs[level] >= be16_to_cpu(left->bb_numrecs)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
} }
mp = cur->bc_mp; mp = cur->bc_mp;
if ((error = xfs_btree_read_bufl(mp, cur->bc_tp, INT_GET(left->bb_rightsib, ARCH_CONVERT), 0, if ((error = xfs_btree_read_bufl(mp, cur->bc_tp, be64_to_cpu(left->bb_rightsib), 0,
&rbp, XFS_BMAP_BTREE_REF))) { &rbp, XFS_BMAP_BTREE_REF))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
@ -1435,26 +1435,26 @@ xfs_bmbt_rshift(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
if (INT_GET(right->bb_numrecs, ARCH_CONVERT) == XFS_BMAP_BLOCK_IMAXRECS(level, cur)) { if (be16_to_cpu(right->bb_numrecs) == XFS_BMAP_BLOCK_IMAXRECS(level, cur)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
} }
if (level > 0) { if (level > 0) {
lkp = XFS_BMAP_KEY_IADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lkp = XFS_BMAP_KEY_IADDR(left, be16_to_cpu(left->bb_numrecs), cur);
lpp = XFS_BMAP_PTR_IADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lpp = XFS_BMAP_PTR_IADDR(left, be16_to_cpu(left->bb_numrecs), cur);
rkp = XFS_BMAP_KEY_IADDR(right, 1, cur); rkp = XFS_BMAP_KEY_IADDR(right, 1, cur);
rpp = XFS_BMAP_PTR_IADDR(right, 1, cur); rpp = XFS_BMAP_PTR_IADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = INT_GET(right->bb_numrecs, ARCH_CONVERT) - 1; i >= 0; i--) { for (i = be16_to_cpu(right->bb_numrecs) - 1; i >= 0; i--) {
if ((error = xfs_btree_check_lptr(cur, INT_GET(rpp[i], ARCH_CONVERT), level))) { if ((error = xfs_btree_check_lptr(cur, INT_GET(rpp[i], ARCH_CONVERT), level))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
} }
#endif #endif
memmove(rkp + 1, rkp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rkp)); memmove(rkp + 1, rkp, be16_to_cpu(right->bb_numrecs) * sizeof(*rkp));
memmove(rpp + 1, rpp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rpp)); memmove(rpp + 1, rpp, be16_to_cpu(right->bb_numrecs) * sizeof(*rpp));
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_lptr(cur, INT_GET(*lpp, ARCH_CONVERT), level))) { if ((error = xfs_btree_check_lptr(cur, INT_GET(*lpp, ARCH_CONVERT), level))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
@ -1463,21 +1463,21 @@ xfs_bmbt_rshift(
#endif #endif
*rkp = *lkp; *rkp = *lkp;
*rpp = *lpp; /* INT_: direct copy */ *rpp = *lpp; /* INT_: direct copy */
xfs_bmbt_log_keys(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_bmbt_log_keys(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
xfs_bmbt_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_bmbt_log_ptrs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
} else { } else {
lrp = XFS_BMAP_REC_IADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lrp = XFS_BMAP_REC_IADDR(left, be16_to_cpu(left->bb_numrecs), cur);
rrp = XFS_BMAP_REC_IADDR(right, 1, cur); rrp = XFS_BMAP_REC_IADDR(right, 1, cur);
memmove(rrp + 1, rrp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rrp)); memmove(rrp + 1, rrp, be16_to_cpu(right->bb_numrecs) * sizeof(*rrp));
*rrp = *lrp; *rrp = *lrp;
xfs_bmbt_log_recs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_bmbt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
INT_SET(key.br_startoff, ARCH_CONVERT, INT_SET(key.br_startoff, ARCH_CONVERT,
xfs_bmbt_disk_get_startoff(rrp)); xfs_bmbt_disk_get_startoff(rrp));
rkp = &key; rkp = &key;
} }
INT_MOD(left->bb_numrecs, ARCH_CONVERT, -1); be16_add(&left->bb_numrecs, -1);
xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS); xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS);
INT_MOD(right->bb_numrecs, ARCH_CONVERT, +1); be16_add(&right->bb_numrecs, 1);
#ifdef DEBUG #ifdef DEBUG
if (level > 0) if (level > 0)
xfs_btree_check_key(XFS_BTNUM_BMAP, rkp, rkp + 1); xfs_btree_check_key(XFS_BTNUM_BMAP, rkp, rkp + 1);
@ -1608,47 +1608,47 @@ xfs_bmbt_split(
return error; return error;
} }
#endif #endif
INT_SET(right->bb_magic, ARCH_CONVERT, XFS_BMAP_MAGIC); right->bb_magic = cpu_to_be32(XFS_BMAP_MAGIC);
right->bb_level = left->bb_level; /* INT_: direct copy */ right->bb_level = left->bb_level;
INT_SET(right->bb_numrecs, ARCH_CONVERT, (__uint16_t)(INT_GET(left->bb_numrecs, ARCH_CONVERT) / 2)); right->bb_numrecs = cpu_to_be16(be16_to_cpu(left->bb_numrecs) / 2);
if ((INT_GET(left->bb_numrecs, ARCH_CONVERT) & 1) && if ((be16_to_cpu(left->bb_numrecs) & 1) &&
cur->bc_ptrs[level] <= INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1) cur->bc_ptrs[level] <= be16_to_cpu(right->bb_numrecs) + 1)
INT_MOD(right->bb_numrecs, ARCH_CONVERT, +1); be16_add(&right->bb_numrecs, 1);
i = INT_GET(left->bb_numrecs, ARCH_CONVERT) - INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1; i = be16_to_cpu(left->bb_numrecs) - be16_to_cpu(right->bb_numrecs) + 1;
if (level > 0) { if (level > 0) {
lkp = XFS_BMAP_KEY_IADDR(left, i, cur); lkp = XFS_BMAP_KEY_IADDR(left, i, cur);
lpp = XFS_BMAP_PTR_IADDR(left, i, cur); lpp = XFS_BMAP_PTR_IADDR(left, i, cur);
rkp = XFS_BMAP_KEY_IADDR(right, 1, cur); rkp = XFS_BMAP_KEY_IADDR(right, 1, cur);
rpp = XFS_BMAP_PTR_IADDR(right, 1, cur); rpp = XFS_BMAP_PTR_IADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < INT_GET(right->bb_numrecs, ARCH_CONVERT); i++) { for (i = 0; i < be16_to_cpu(right->bb_numrecs); i++) {
if ((error = xfs_btree_check_lptr(cur, INT_GET(lpp[i], ARCH_CONVERT), level))) { if ((error = xfs_btree_check_lptr(cur, INT_GET(lpp[i], ARCH_CONVERT), level))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
} }
#endif #endif
memcpy(rkp, lkp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rkp)); memcpy(rkp, lkp, be16_to_cpu(right->bb_numrecs) * sizeof(*rkp));
memcpy(rpp, lpp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rpp)); memcpy(rpp, lpp, be16_to_cpu(right->bb_numrecs) * sizeof(*rpp));
xfs_bmbt_log_keys(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_keys(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
xfs_bmbt_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_ptrs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
keyp->br_startoff = INT_GET(rkp->br_startoff, ARCH_CONVERT); keyp->br_startoff = INT_GET(rkp->br_startoff, ARCH_CONVERT);
} else { } else {
lrp = XFS_BMAP_REC_IADDR(left, i, cur); lrp = XFS_BMAP_REC_IADDR(left, i, cur);
rrp = XFS_BMAP_REC_IADDR(right, 1, cur); rrp = XFS_BMAP_REC_IADDR(right, 1, cur);
memcpy(rrp, lrp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rrp)); memcpy(rrp, lrp, be16_to_cpu(right->bb_numrecs) * sizeof(*rrp));
xfs_bmbt_log_recs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
keyp->br_startoff = xfs_bmbt_disk_get_startoff(rrp); keyp->br_startoff = xfs_bmbt_disk_get_startoff(rrp);
} }
INT_MOD(left->bb_numrecs, ARCH_CONVERT, -(INT_GET(right->bb_numrecs, ARCH_CONVERT))); be16_add(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs)));
right->bb_rightsib = left->bb_rightsib; /* INT_: direct copy */ right->bb_rightsib = left->bb_rightsib;
INT_SET(left->bb_rightsib, ARCH_CONVERT, args.fsbno); left->bb_rightsib = cpu_to_be64(args.fsbno);
INT_SET(right->bb_leftsib, ARCH_CONVERT, lbno); right->bb_leftsib = cpu_to_be64(lbno);
xfs_bmbt_log_block(cur, rbp, XFS_BB_ALL_BITS); xfs_bmbt_log_block(cur, rbp, XFS_BB_ALL_BITS);
xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS | XFS_BB_RIGHTSIB); xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS | XFS_BB_RIGHTSIB);
if (INT_GET(right->bb_rightsib, ARCH_CONVERT) != NULLDFSBNO) { if (be64_to_cpu(right->bb_rightsib) != NULLDFSBNO) {
if ((error = xfs_btree_read_bufl(args.mp, args.tp, if ((error = xfs_btree_read_bufl(args.mp, args.tp,
INT_GET(right->bb_rightsib, ARCH_CONVERT), 0, &rrbp, be64_to_cpu(right->bb_rightsib), 0, &rrbp,
XFS_BMAP_BTREE_REF))) { XFS_BMAP_BTREE_REF))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
@ -1658,12 +1658,12 @@ xfs_bmbt_split(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
INT_SET(rrblock->bb_leftsib, ARCH_CONVERT, args.fsbno); rrblock->bb_leftsib = cpu_to_be64(args.fsbno);
xfs_bmbt_log_block(cur, rrbp, XFS_BB_LEFTSIB); xfs_bmbt_log_block(cur, rrbp, XFS_BB_LEFTSIB);
} }
if (cur->bc_ptrs[level] > INT_GET(left->bb_numrecs, ARCH_CONVERT) + 1) { if (cur->bc_ptrs[level] > be16_to_cpu(left->bb_numrecs) + 1) {
xfs_btree_setbuf(cur, level, rbp); xfs_btree_setbuf(cur, level, rbp);
cur->bc_ptrs[level] -= INT_GET(left->bb_numrecs, ARCH_CONVERT); cur->bc_ptrs[level] -= be16_to_cpu(left->bb_numrecs);
} }
if (level + 1 < cur->bc_nlevels) { if (level + 1 < cur->bc_nlevels) {
if ((error = xfs_btree_dup_cursor(cur, curp))) { if ((error = xfs_btree_dup_cursor(cur, curp))) {
@ -1735,18 +1735,18 @@ xfs_bmdr_to_bmbt(
xfs_bmbt_key_t *tkp; xfs_bmbt_key_t *tkp;
xfs_bmbt_ptr_t *tpp; xfs_bmbt_ptr_t *tpp;
INT_SET(rblock->bb_magic, ARCH_CONVERT, XFS_BMAP_MAGIC); rblock->bb_magic = cpu_to_be32(XFS_BMAP_MAGIC);
rblock->bb_level = dblock->bb_level; /* both in on-disk format */ rblock->bb_level = dblock->bb_level;
ASSERT(INT_GET(rblock->bb_level, ARCH_CONVERT) > 0); ASSERT(be16_to_cpu(rblock->bb_level) > 0);
rblock->bb_numrecs = dblock->bb_numrecs;/* both in on-disk format */ rblock->bb_numrecs = dblock->bb_numrecs;
INT_SET(rblock->bb_leftsib, ARCH_CONVERT, NULLDFSBNO); rblock->bb_leftsib = cpu_to_be64(NULLDFSBNO);
INT_SET(rblock->bb_rightsib, ARCH_CONVERT, NULLDFSBNO); rblock->bb_rightsib = cpu_to_be64(NULLDFSBNO);
dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0); dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0);
fkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr); fkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);
tkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen); tkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen);
fpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr); fpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);
tpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen); tpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen);
dmxr = INT_GET(dblock->bb_numrecs, ARCH_CONVERT); dmxr = be16_to_cpu(dblock->bb_numrecs);
memcpy(tkp, fkp, sizeof(*fkp) * dmxr); memcpy(tkp, fkp, sizeof(*fkp) * dmxr);
memcpy(tpp, fpp, sizeof(*fpp) * dmxr); /* INT_: direct copy */ memcpy(tpp, fpp, sizeof(*fpp) * dmxr); /* INT_: direct copy */
} }
@ -1789,7 +1789,7 @@ xfs_bmbt_decrement(
return error; return error;
} }
#endif #endif
if (INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO) { if (be64_to_cpu(block->bb_leftsib) == NULLDFSBNO) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
@ -1821,7 +1821,7 @@ xfs_bmbt_decrement(
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
cur->bc_ptrs[lev] = INT_GET(block->bb_numrecs, ARCH_CONVERT); cur->bc_ptrs[lev] = be16_to_cpu(block->bb_numrecs);
} }
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 1; *stat = 1;
@ -2107,12 +2107,12 @@ xfs_bmbt_increment(
return error; return error;
} }
#endif #endif
if (++cur->bc_ptrs[level] <= INT_GET(block->bb_numrecs, ARCH_CONVERT)) { if (++cur->bc_ptrs[level] <= be16_to_cpu(block->bb_numrecs)) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 1; *stat = 1;
return 0; return 0;
} }
if (INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO) { if (be64_to_cpu(block->bb_rightsib) == NULLDFSBNO) {
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*stat = 0; *stat = 0;
return 0; return 0;
@ -2125,7 +2125,7 @@ xfs_bmbt_increment(
return error; return error;
} }
#endif #endif
if (++cur->bc_ptrs[lev] <= INT_GET(block->bb_numrecs, ARCH_CONVERT)) if (++cur->bc_ptrs[lev] <= be16_to_cpu(block->bb_numrecs))
break; break;
if (lev < cur->bc_nlevels - 1) if (lev < cur->bc_nlevels - 1)
xfs_btree_readahead(cur, lev, XFS_BTCUR_RIGHTRA); xfs_btree_readahead(cur, lev, XFS_BTCUR_RIGHTRA);
@ -2387,23 +2387,23 @@ xfs_bmbt_newroot(
bp = xfs_btree_get_bufl(args.mp, cur->bc_tp, args.fsbno, 0); bp = xfs_btree_get_bufl(args.mp, cur->bc_tp, args.fsbno, 0);
cblock = XFS_BUF_TO_BMBT_BLOCK(bp); cblock = XFS_BUF_TO_BMBT_BLOCK(bp);
*cblock = *block; *cblock = *block;
INT_MOD(block->bb_level, ARCH_CONVERT, +1); be16_add(&block->bb_level, 1);
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); block->bb_numrecs = cpu_to_be16(1);
cur->bc_nlevels++; cur->bc_nlevels++;
cur->bc_ptrs[level + 1] = 1; cur->bc_ptrs[level + 1] = 1;
kp = XFS_BMAP_KEY_IADDR(block, 1, cur); kp = XFS_BMAP_KEY_IADDR(block, 1, cur);
ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur); ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur);
memcpy(ckp, kp, INT_GET(cblock->bb_numrecs, ARCH_CONVERT) * sizeof(*kp)); memcpy(ckp, kp, be16_to_cpu(cblock->bb_numrecs) * sizeof(*kp));
cpp = XFS_BMAP_PTR_IADDR(cblock, 1, cur); cpp = XFS_BMAP_PTR_IADDR(cblock, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < INT_GET(cblock->bb_numrecs, ARCH_CONVERT); i++) { for (i = 0; i < be16_to_cpu(cblock->bb_numrecs); i++) {
if ((error = xfs_btree_check_lptr(cur, INT_GET(pp[i], ARCH_CONVERT), level))) { if ((error = xfs_btree_check_lptr(cur, INT_GET(pp[i], ARCH_CONVERT), level))) {
XFS_BMBT_TRACE_CURSOR(cur, ERROR); XFS_BMBT_TRACE_CURSOR(cur, ERROR);
return error; return error;
} }
} }
#endif #endif
memcpy(cpp, pp, INT_GET(cblock->bb_numrecs, ARCH_CONVERT) * sizeof(*pp)); memcpy(cpp, pp, be16_to_cpu(cblock->bb_numrecs) * sizeof(*pp));
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_lptr(cur, (xfs_bmbt_ptr_t)args.fsbno, if ((error = xfs_btree_check_lptr(cur, (xfs_bmbt_ptr_t)args.fsbno,
level))) { level))) {
@ -2412,7 +2412,7 @@ xfs_bmbt_newroot(
} }
#endif #endif
INT_SET(*pp, ARCH_CONVERT, args.fsbno); INT_SET(*pp, ARCH_CONVERT, args.fsbno);
xfs_iroot_realloc(cur->bc_private.b.ip, 1 - INT_GET(cblock->bb_numrecs, ARCH_CONVERT), xfs_iroot_realloc(cur->bc_private.b.ip, 1 - be16_to_cpu(cblock->bb_numrecs),
cur->bc_private.b.whichfork); cur->bc_private.b.whichfork);
xfs_btree_setbuf(cur, level, bp); xfs_btree_setbuf(cur, level, bp);
/* /*
@ -2420,8 +2420,8 @@ xfs_bmbt_newroot(
* the root is at the right level. * the root is at the right level.
*/ */
xfs_bmbt_log_block(cur, bp, XFS_BB_ALL_BITS); xfs_bmbt_log_block(cur, bp, XFS_BB_ALL_BITS);
xfs_bmbt_log_keys(cur, bp, 1, INT_GET(cblock->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_keys(cur, bp, 1, be16_to_cpu(cblock->bb_numrecs));
xfs_bmbt_log_ptrs(cur, bp, 1, INT_GET(cblock->bb_numrecs, ARCH_CONVERT)); xfs_bmbt_log_ptrs(cur, bp, 1, be16_to_cpu(cblock->bb_numrecs));
XFS_BMBT_TRACE_CURSOR(cur, EXIT); XFS_BMBT_TRACE_CURSOR(cur, EXIT);
*logflags |= *logflags |=
XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork); XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork);
@ -2689,18 +2689,18 @@ xfs_bmbt_to_bmdr(
xfs_bmbt_key_t *tkp; xfs_bmbt_key_t *tkp;
xfs_bmbt_ptr_t *tpp; xfs_bmbt_ptr_t *tpp;
ASSERT(INT_GET(rblock->bb_magic, ARCH_CONVERT) == XFS_BMAP_MAGIC); ASSERT(be32_to_cpu(rblock->bb_magic) == XFS_BMAP_MAGIC);
ASSERT(INT_GET(rblock->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO); ASSERT(be64_to_cpu(rblock->bb_leftsib) == NULLDFSBNO);
ASSERT(INT_GET(rblock->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO); ASSERT(be64_to_cpu(rblock->bb_rightsib) == NULLDFSBNO);
ASSERT(INT_GET(rblock->bb_level, ARCH_CONVERT) > 0); ASSERT(be16_to_cpu(rblock->bb_level) > 0);
dblock->bb_level = rblock->bb_level; /* both in on-disk format */ dblock->bb_level = rblock->bb_level;
dblock->bb_numrecs = rblock->bb_numrecs;/* both in on-disk format */ dblock->bb_numrecs = rblock->bb_numrecs;
dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0); dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0);
fkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen); fkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen);
tkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr); tkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);
fpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen); fpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen);
tpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr); tpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);
dmxr = INT_GET(dblock->bb_numrecs, ARCH_CONVERT); dmxr = be16_to_cpu(dblock->bb_numrecs);
memcpy(tkp, fkp, sizeof(*fkp) * dmxr); memcpy(tkp, fkp, sizeof(*fkp) * dmxr);
memcpy(tpp, fpp, sizeof(*fpp) * dmxr); /* INT_: direct copy */ memcpy(tpp, fpp, sizeof(*fpp) * dmxr); /* INT_: direct copy */
} }

44
fs/xfs/xfs_bmap_btree.h
Просмотреть файл

@ -28,10 +28,9 @@ struct xfs_inode;
/* /*
* Bmap root header, on-disk form only. * Bmap root header, on-disk form only.
*/ */
typedef struct xfs_bmdr_block typedef struct xfs_bmdr_block {
{ __be16 bb_level; /* 0 is a leaf */
__uint16_t bb_level; /* 0 is a leaf */ __be16 bb_numrecs; /* current # of data records */
__uint16_t bb_numrecs; /* current # of data records */
} xfs_bmdr_block_t; } xfs_bmdr_block_t;
/* /*
@ -212,36 +211,36 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t;
#define XFS_BMAP_REC_DADDR(bb,i,cur) \ #define XFS_BMAP_REC_DADDR(bb,i,cur) \
(XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_DSIZE( \ (XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_DSIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
#define XFS_BMAP_REC_IADDR(bb,i,cur) \ #define XFS_BMAP_REC_IADDR(bb,i,cur) \
(XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_ISIZE( \ (XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_ISIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
#define XFS_BMAP_KEY_DADDR(bb,i,cur) \ #define XFS_BMAP_KEY_DADDR(bb,i,cur) \
(XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_DSIZE( \ (XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_DSIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
#define XFS_BMAP_KEY_IADDR(bb,i,cur) \ #define XFS_BMAP_KEY_IADDR(bb,i,cur) \
(XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_ISIZE( \ (XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_ISIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
#define XFS_BMAP_PTR_DADDR(bb,i,cur) \ #define XFS_BMAP_PTR_DADDR(bb,i,cur) \
(XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_DSIZE( \ (XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_DSIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
#define XFS_BMAP_PTR_IADDR(bb,i,cur) \ #define XFS_BMAP_PTR_IADDR(bb,i,cur) \
(XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_ISIZE( \ (XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_ISIZE( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur), \ be16_to_cpu((bb)->bb_level), cur), \
xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \ xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS( \
INT_GET((bb)->bb_level, ARCH_CONVERT), cur))) be16_to_cpu((bb)->bb_level), cur)))
/* /*
* These are to be used when we know the size of the block and * These are to be used when we know the size of the block and
@ -254,7 +253,7 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t;
#define XFS_BMAP_BROOT_PTR_ADDR(bb,i,sz) \ #define XFS_BMAP_BROOT_PTR_ADDR(bb,i,sz) \
(XFS_BTREE_PTR_ADDR(sz,xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz))) (XFS_BTREE_PTR_ADDR(sz,xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz)))
#define XFS_BMAP_BROOT_NUMRECS(bb) INT_GET((bb)->bb_numrecs, ARCH_CONVERT) #define XFS_BMAP_BROOT_NUMRECS(bb) be16_to_cpu((bb)->bb_numrecs)
#define XFS_BMAP_BROOT_MAXRECS(sz) XFS_BTREE_BLOCK_MAXRECS(sz,xfs_bmbt,0) #define XFS_BMAP_BROOT_MAXRECS(sz) XFS_BTREE_BLOCK_MAXRECS(sz,xfs_bmbt,0)
#define XFS_BMAP_BROOT_SPACE_CALC(nrecs) \ #define XFS_BMAP_BROOT_SPACE_CALC(nrecs) \
@ -262,7 +261,7 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t;
((nrecs) * (sizeof(xfs_bmbt_key_t) + sizeof(xfs_bmbt_ptr_t)))) ((nrecs) * (sizeof(xfs_bmbt_key_t) + sizeof(xfs_bmbt_ptr_t))))
#define XFS_BMAP_BROOT_SPACE(bb) \ #define XFS_BMAP_BROOT_SPACE(bb) \
(XFS_BMAP_BROOT_SPACE_CALC(INT_GET((bb)->bb_numrecs, ARCH_CONVERT))) (XFS_BMAP_BROOT_SPACE_CALC(be16_to_cpu((bb)->bb_numrecs)))
#define XFS_BMDR_SPACE_CALC(nrecs) \ #define XFS_BMDR_SPACE_CALC(nrecs) \
(int)(sizeof(xfs_bmdr_block_t) + \ (int)(sizeof(xfs_bmdr_block_t) + \
((nrecs) * (sizeof(xfs_bmbt_key_t) + sizeof(xfs_bmbt_ptr_t)))) ((nrecs) * (sizeof(xfs_bmbt_key_t) + sizeof(xfs_bmbt_ptr_t))))
@ -273,11 +272,10 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t;
#define XFS_BM_MAXLEVELS(mp,w) ((mp)->m_bm_maxlevels[(w)]) #define XFS_BM_MAXLEVELS(mp,w) ((mp)->m_bm_maxlevels[(w)])
#define XFS_BMAP_SANITY_CHECK(mp,bb,level) \ #define XFS_BMAP_SANITY_CHECK(mp,bb,level) \
(INT_GET((bb)->bb_magic, ARCH_CONVERT) == XFS_BMAP_MAGIC && \ (be32_to_cpu((bb)->bb_magic) == XFS_BMAP_MAGIC && \
INT_GET((bb)->bb_level, ARCH_CONVERT) == level && \ be16_to_cpu((bb)->bb_level) == level && \
INT_GET((bb)->bb_numrecs, ARCH_CONVERT) > 0 && \ be16_to_cpu((bb)->bb_numrecs) > 0 && \
INT_GET((bb)->bb_numrecs, ARCH_CONVERT) <= \ be16_to_cpu((bb)->bb_numrecs) <= (mp)->m_bmap_dmxr[(level) != 0])
(mp)->m_bmap_dmxr[(level) != 0])
#ifdef __KERNEL__ #ifdef __KERNEL__

104
fs/xfs/xfs_btree.c
Просмотреть файл

@ -90,11 +90,14 @@ xfs_btree_maxrecs(
switch (cur->bc_btnum) { switch (cur->bc_btnum) {
case XFS_BTNUM_BNO: case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT: case XFS_BTNUM_CNT:
return (int)XFS_ALLOC_BLOCK_MAXRECS(INT_GET(block->bb_h.bb_level, ARCH_CONVERT), cur); return (int)XFS_ALLOC_BLOCK_MAXRECS(
be16_to_cpu(block->bb_h.bb_level), cur);
case XFS_BTNUM_BMAP: case XFS_BTNUM_BMAP:
return (int)XFS_BMAP_BLOCK_IMAXRECS(INT_GET(block->bb_h.bb_level, ARCH_CONVERT), cur); return (int)XFS_BMAP_BLOCK_IMAXRECS(
be16_to_cpu(block->bb_h.bb_level), cur);
case XFS_BTNUM_INO: case XFS_BTNUM_INO:
return (int)XFS_INOBT_BLOCK_MAXRECS(INT_GET(block->bb_h.bb_level, ARCH_CONVERT), cur); return (int)XFS_INOBT_BLOCK_MAXRECS(
be16_to_cpu(block->bb_h.bb_level), cur);
default: default:
ASSERT(0); ASSERT(0);
return 0; return 0;
@ -140,7 +143,7 @@ xfs_btree_check_key(
k1 = ak1; k1 = ak1;
k2 = ak2; k2 = ak2;
ASSERT(INT_GET(k1->ar_startblock, ARCH_CONVERT) < INT_GET(k2->ar_startblock, ARCH_CONVERT)); ASSERT(be32_to_cpu(k1->ar_startblock) < be32_to_cpu(k2->ar_startblock));
break; break;
} }
case XFS_BTNUM_CNT: { case XFS_BTNUM_CNT: {
@ -149,9 +152,9 @@ xfs_btree_check_key(
k1 = ak1; k1 = ak1;
k2 = ak2; k2 = ak2;
ASSERT(INT_GET(k1->ar_blockcount, ARCH_CONVERT) < INT_GET(k2->ar_blockcount, ARCH_CONVERT) || ASSERT(be32_to_cpu(k1->ar_blockcount) < be32_to_cpu(k2->ar_blockcount) ||
(INT_GET(k1->ar_blockcount, ARCH_CONVERT) == INT_GET(k2->ar_blockcount, ARCH_CONVERT) && (k1->ar_blockcount == k2->ar_blockcount &&
INT_GET(k1->ar_startblock, ARCH_CONVERT) < INT_GET(k2->ar_startblock, ARCH_CONVERT))); be32_to_cpu(k1->ar_startblock) < be32_to_cpu(k2->ar_startblock)));
break; break;
} }
case XFS_BTNUM_BMAP: { case XFS_BTNUM_BMAP: {
@ -194,16 +197,16 @@ xfs_btree_check_lblock(
mp = cur->bc_mp; mp = cur->bc_mp;
lblock_ok = lblock_ok =
INT_GET(block->bb_magic, ARCH_CONVERT) == xfs_magics[cur->bc_btnum] && be32_to_cpu(block->bb_magic) == xfs_magics[cur->bc_btnum] &&
INT_GET(block->bb_level, ARCH_CONVERT) == level && be16_to_cpu(block->bb_level) == level &&
INT_GET(block->bb_numrecs, ARCH_CONVERT) <= be16_to_cpu(block->bb_numrecs) <=
xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) && xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) &&
block->bb_leftsib && block->bb_leftsib &&
(INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO || (be64_to_cpu(block->bb_leftsib) == NULLDFSBNO ||
XFS_FSB_SANITY_CHECK(mp, INT_GET(block->bb_leftsib, ARCH_CONVERT))) && XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_leftsib))) &&
block->bb_rightsib && block->bb_rightsib &&
(INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO || (be64_to_cpu(block->bb_rightsib) == NULLDFSBNO ||
XFS_FSB_SANITY_CHECK(mp, INT_GET(block->bb_rightsib, ARCH_CONVERT))); XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_rightsib)));
if (unlikely(XFS_TEST_ERROR(!lblock_ok, mp, XFS_ERRTAG_BTREE_CHECK_LBLOCK, if (unlikely(XFS_TEST_ERROR(!lblock_ok, mp, XFS_ERRTAG_BTREE_CHECK_LBLOCK,
XFS_RANDOM_BTREE_CHECK_LBLOCK))) { XFS_RANDOM_BTREE_CHECK_LBLOCK))) {
if (bp) if (bp)
@ -251,8 +254,9 @@ xfs_btree_check_rec(
r1 = ar1; r1 = ar1;
r2 = ar2; r2 = ar2;
ASSERT(INT_GET(r1->ar_startblock, ARCH_CONVERT) + INT_GET(r1->ar_blockcount, ARCH_CONVERT) <= ASSERT(be32_to_cpu(r1->ar_startblock) +
INT_GET(r2->ar_startblock, ARCH_CONVERT)); be32_to_cpu(r1->ar_blockcount) <=
be32_to_cpu(r2->ar_startblock));
break; break;
} }
case XFS_BTNUM_CNT: { case XFS_BTNUM_CNT: {
@ -261,9 +265,9 @@ xfs_btree_check_rec(
r1 = ar1; r1 = ar1;
r2 = ar2; r2 = ar2;
ASSERT(INT_GET(r1->ar_blockcount, ARCH_CONVERT) < INT_GET(r2->ar_blockcount, ARCH_CONVERT) || ASSERT(be32_to_cpu(r1->ar_blockcount) < be32_to_cpu(r2->ar_blockcount) ||
(INT_GET(r1->ar_blockcount, ARCH_CONVERT) == INT_GET(r2->ar_blockcount, ARCH_CONVERT) && (r1->ar_blockcount == r2->ar_blockcount &&
INT_GET(r1->ar_startblock, ARCH_CONVERT) < INT_GET(r2->ar_startblock, ARCH_CONVERT))); be32_to_cpu(r1->ar_startblock) < be32_to_cpu(r2->ar_startblock)));
break; break;
} }
case XFS_BTNUM_BMAP: { case XFS_BTNUM_BMAP: {
@ -311,17 +315,17 @@ xfs_btree_check_sblock(
agbp = cur->bc_private.a.agbp; agbp = cur->bc_private.a.agbp;
agf = XFS_BUF_TO_AGF(agbp); agf = XFS_BUF_TO_AGF(agbp);
agflen = INT_GET(agf->agf_length, ARCH_CONVERT); agflen = be32_to_cpu(agf->agf_length);
sblock_ok = sblock_ok =
INT_GET(block->bb_magic, ARCH_CONVERT) == xfs_magics[cur->bc_btnum] && be32_to_cpu(block->bb_magic) == xfs_magics[cur->bc_btnum] &&
INT_GET(block->bb_level, ARCH_CONVERT) == level && be16_to_cpu(block->bb_level) == level &&
INT_GET(block->bb_numrecs, ARCH_CONVERT) <= be16_to_cpu(block->bb_numrecs) <=
xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) && xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) &&
(INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLAGBLOCK || (be32_to_cpu(block->bb_leftsib) == NULLAGBLOCK ||
INT_GET(block->bb_leftsib, ARCH_CONVERT) < agflen) && be32_to_cpu(block->bb_leftsib) < agflen) &&
block->bb_leftsib && block->bb_leftsib &&
(INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK || (be32_to_cpu(block->bb_rightsib) == NULLAGBLOCK ||
INT_GET(block->bb_rightsib, ARCH_CONVERT) < agflen) && be32_to_cpu(block->bb_rightsib) < agflen) &&
block->bb_rightsib; block->bb_rightsib;
if (unlikely(XFS_TEST_ERROR(!sblock_ok, cur->bc_mp, if (unlikely(XFS_TEST_ERROR(!sblock_ok, cur->bc_mp,
XFS_ERRTAG_BTREE_CHECK_SBLOCK, XFS_ERRTAG_BTREE_CHECK_SBLOCK,
@ -352,7 +356,7 @@ xfs_btree_check_sptr(
XFS_WANT_CORRUPTED_RETURN( XFS_WANT_CORRUPTED_RETURN(
level > 0 && level > 0 &&
ptr != NULLAGBLOCK && ptr != 0 && ptr != NULLAGBLOCK && ptr != 0 &&
ptr < INT_GET(agf->agf_length, ARCH_CONVERT)); ptr < be32_to_cpu(agf->agf_length));
return 0; return 0;
} }
@ -591,15 +595,15 @@ xfs_btree_init_cursor(
case XFS_BTNUM_BNO: case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT: case XFS_BTNUM_CNT:
agf = XFS_BUF_TO_AGF(agbp); agf = XFS_BUF_TO_AGF(agbp);
nlevels = INT_GET(agf->agf_levels[btnum], ARCH_CONVERT); nlevels = be32_to_cpu(agf->agf_levels[btnum]);
break; break;
case XFS_BTNUM_BMAP: case XFS_BTNUM_BMAP:
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
nlevels = INT_GET(ifp->if_broot->bb_level, ARCH_CONVERT) + 1; nlevels = be16_to_cpu(ifp->if_broot->bb_level) + 1;
break; break;
case XFS_BTNUM_INO: case XFS_BTNUM_INO:
agi = XFS_BUF_TO_AGI(agbp); agi = XFS_BUF_TO_AGI(agbp);
nlevels = INT_GET(agi->agi_level, ARCH_CONVERT); nlevels = be32_to_cpu(agi->agi_level);
break; break;
default: default:
ASSERT(0); ASSERT(0);
@ -663,9 +667,9 @@ xfs_btree_islastblock(
block = xfs_btree_get_block(cur, level, &bp); block = xfs_btree_get_block(cur, level, &bp);
xfs_btree_check_block(cur, block, level, bp); xfs_btree_check_block(cur, block, level, bp);
if (XFS_BTREE_LONG_PTRS(cur->bc_btnum)) if (XFS_BTREE_LONG_PTRS(cur->bc_btnum))
return INT_GET(block->bb_u.l.bb_rightsib, ARCH_CONVERT) == NULLDFSBNO; return be64_to_cpu(block->bb_u.l.bb_rightsib) == NULLDFSBNO;
else else
return INT_GET(block->bb_u.s.bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK; return be32_to_cpu(block->bb_u.s.bb_rightsib) == NULLAGBLOCK;
} }
/* /*
@ -693,7 +697,7 @@ xfs_btree_lastrec(
/* /*
* Set the ptr value to numrecs, that's the last record/key. * Set the ptr value to numrecs, that's the last record/key.
*/ */
cur->bc_ptrs[level] = INT_GET(block->bb_h.bb_numrecs, ARCH_CONVERT); cur->bc_ptrs[level] = be16_to_cpu(block->bb_h.bb_numrecs);
return 1; return 1;
} }
@ -863,38 +867,38 @@ xfs_btree_readahead_core(
case XFS_BTNUM_BNO: case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT: case XFS_BTNUM_CNT:
a = XFS_BUF_TO_ALLOC_BLOCK(cur->bc_bufs[lev]); a = XFS_BUF_TO_ALLOC_BLOCK(cur->bc_bufs[lev]);
if ((lr & XFS_BTCUR_LEFTRA) && INT_GET(a->bb_leftsib, ARCH_CONVERT) != NULLAGBLOCK) { if ((lr & XFS_BTCUR_LEFTRA) && be32_to_cpu(a->bb_leftsib) != NULLAGBLOCK) {
xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno, xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,
INT_GET(a->bb_leftsib, ARCH_CONVERT), 1); be32_to_cpu(a->bb_leftsib), 1);
rval++; rval++;
} }
if ((lr & XFS_BTCUR_RIGHTRA) && INT_GET(a->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { if ((lr & XFS_BTCUR_RIGHTRA) && be32_to_cpu(a->bb_rightsib) != NULLAGBLOCK) {
xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno, xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,
INT_GET(a->bb_rightsib, ARCH_CONVERT), 1); be32_to_cpu(a->bb_rightsib), 1);
rval++; rval++;
} }
break; break;
case XFS_BTNUM_BMAP: case XFS_BTNUM_BMAP:
b = XFS_BUF_TO_BMBT_BLOCK(cur->bc_bufs[lev]); b = XFS_BUF_TO_BMBT_BLOCK(cur->bc_bufs[lev]);
if ((lr & XFS_BTCUR_LEFTRA) && INT_GET(b->bb_leftsib, ARCH_CONVERT) != NULLDFSBNO) { if ((lr & XFS_BTCUR_LEFTRA) && be64_to_cpu(b->bb_leftsib) != NULLDFSBNO) {
xfs_btree_reada_bufl(cur->bc_mp, INT_GET(b->bb_leftsib, ARCH_CONVERT), 1); xfs_btree_reada_bufl(cur->bc_mp, be64_to_cpu(b->bb_leftsib), 1);
rval++; rval++;
} }
if ((lr & XFS_BTCUR_RIGHTRA) && INT_GET(b->bb_rightsib, ARCH_CONVERT) != NULLDFSBNO) { if ((lr & XFS_BTCUR_RIGHTRA) && be64_to_cpu(b->bb_rightsib) != NULLDFSBNO) {
xfs_btree_reada_bufl(cur->bc_mp, INT_GET(b->bb_rightsib, ARCH_CONVERT), 1); xfs_btree_reada_bufl(cur->bc_mp, be64_to_cpu(b->bb_rightsib), 1);
rval++; rval++;
} }
break; break;
case XFS_BTNUM_INO: case XFS_BTNUM_INO:
i = XFS_BUF_TO_INOBT_BLOCK(cur->bc_bufs[lev]); i = XFS_BUF_TO_INOBT_BLOCK(cur->bc_bufs[lev]);
if ((lr & XFS_BTCUR_LEFTRA) && INT_GET(i->bb_leftsib, ARCH_CONVERT) != NULLAGBLOCK) { if ((lr & XFS_BTCUR_LEFTRA) && be32_to_cpu(i->bb_leftsib) != NULLAGBLOCK) {
xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno, xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno,
INT_GET(i->bb_leftsib, ARCH_CONVERT), 1); be32_to_cpu(i->bb_leftsib), 1);
rval++; rval++;
} }
if ((lr & XFS_BTCUR_RIGHTRA) && INT_GET(i->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { if ((lr & XFS_BTCUR_RIGHTRA) && be32_to_cpu(i->bb_rightsib) != NULLAGBLOCK) {
xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno, xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno,
INT_GET(i->bb_rightsib, ARCH_CONVERT), 1); be32_to_cpu(i->bb_rightsib), 1);
rval++; rval++;
} }
break; break;
@ -926,14 +930,14 @@ xfs_btree_setbuf(
return; return;
b = XFS_BUF_TO_BLOCK(bp); b = XFS_BUF_TO_BLOCK(bp);
if (XFS_BTREE_LONG_PTRS(cur->bc_btnum)) { if (XFS_BTREE_LONG_PTRS(cur->bc_btnum)) {
if (INT_GET(b->bb_u.l.bb_leftsib, ARCH_CONVERT) == NULLDFSBNO) if (be64_to_cpu(b->bb_u.l.bb_leftsib) == NULLDFSBNO)
cur->bc_ra[lev] |= XFS_BTCUR_LEFTRA; cur->bc_ra[lev] |= XFS_BTCUR_LEFTRA;
if (INT_GET(b->bb_u.l.bb_rightsib, ARCH_CONVERT) == NULLDFSBNO) if (be64_to_cpu(b->bb_u.l.bb_rightsib) == NULLDFSBNO)
cur->bc_ra[lev] |= XFS_BTCUR_RIGHTRA; cur->bc_ra[lev] |= XFS_BTCUR_RIGHTRA;
} else { } else {
if (INT_GET(b->bb_u.s.bb_leftsib, ARCH_CONVERT) == NULLAGBLOCK) if (be32_to_cpu(b->bb_u.s.bb_leftsib) == NULLAGBLOCK)
cur->bc_ra[lev] |= XFS_BTCUR_LEFTRA; cur->bc_ra[lev] |= XFS_BTCUR_LEFTRA;
if (INT_GET(b->bb_u.s.bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK) if (be32_to_cpu(b->bb_u.s.bb_rightsib) == NULLAGBLOCK)
cur->bc_ra[lev] |= XFS_BTCUR_RIGHTRA; cur->bc_ra[lev] |= XFS_BTCUR_RIGHTRA;
} }
} }

55
fs/xfs/xfs_btree.h
Просмотреть файл

@ -39,25 +39,23 @@ struct xfs_trans;
/* /*
* Short form header: space allocation btrees. * Short form header: space allocation btrees.
*/ */
typedef struct xfs_btree_sblock typedef struct xfs_btree_sblock {
{ __be32 bb_magic; /* magic number for block type */
__uint32_t bb_magic; /* magic number for block type */ __be16 bb_level; /* 0 is a leaf */
__uint16_t bb_level; /* 0 is a leaf */ __be16 bb_numrecs; /* current # of data records */
__uint16_t bb_numrecs; /* current # of data records */ __be32 bb_leftsib; /* left sibling block or NULLAGBLOCK */
xfs_agblock_t bb_leftsib; /* left sibling block or NULLAGBLOCK */ __be32 bb_rightsib; /* right sibling block or NULLAGBLOCK */
xfs_agblock_t bb_rightsib; /* right sibling block or NULLAGBLOCK */
} xfs_btree_sblock_t; } xfs_btree_sblock_t;
/* /*
* Long form header: bmap btrees. * Long form header: bmap btrees.
*/ */
typedef struct xfs_btree_lblock typedef struct xfs_btree_lblock {
{ __be32 bb_magic; /* magic number for block type */
__uint32_t bb_magic; /* magic number for block type */ __be16 bb_level; /* 0 is a leaf */
__uint16_t bb_level; /* 0 is a leaf */ __be16 bb_numrecs; /* current # of data records */
__uint16_t bb_numrecs; /* current # of data records */ __be64 bb_leftsib; /* left sibling block or NULLDFSBNO */
xfs_dfsbno_t bb_leftsib; /* left sibling block or NULLDFSBNO */ __be64 bb_rightsib; /* right sibling block or NULLDFSBNO */
xfs_dfsbno_t bb_rightsib; /* right sibling block or NULLDFSBNO */
} xfs_btree_lblock_t; } xfs_btree_lblock_t;
/* /*
@ -65,24 +63,23 @@ typedef struct xfs_btree_lblock
*/ */
typedef struct xfs_btree_hdr typedef struct xfs_btree_hdr
{ {
__uint32_t bb_magic; /* magic number for block type */ __be32 bb_magic; /* magic number for block type */
__uint16_t bb_level; /* 0 is a leaf */ __be16 bb_level; /* 0 is a leaf */
__uint16_t bb_numrecs; /* current # of data records */ __be16 bb_numrecs; /* current # of data records */
} xfs_btree_hdr_t; } xfs_btree_hdr_t;
typedef struct xfs_btree_block typedef struct xfs_btree_block {
{
xfs_btree_hdr_t bb_h; /* header */ xfs_btree_hdr_t bb_h; /* header */
union { union {
struct {
__be32 bb_leftsib;
__be32 bb_rightsib;
} s; /* short form pointers */
struct { struct {
xfs_agblock_t bb_leftsib; __be64 bb_leftsib;
xfs_agblock_t bb_rightsib; __be64 bb_rightsib;
} s; /* short form pointers */ } l; /* long form pointers */
struct { } bb_u; /* rest */
xfs_dfsbno_t bb_leftsib;
xfs_dfsbno_t bb_rightsib;
} l; /* long form pointers */
} bb_u; /* rest */
} xfs_btree_block_t; } xfs_btree_block_t;
/* /*
@ -146,7 +143,7 @@ typedef struct xfs_btree_cur
struct xfs_trans *bc_tp; /* transaction we're in, if any */ struct xfs_trans *bc_tp; /* transaction we're in, if any */
struct xfs_mount *bc_mp; /* file system mount struct */ struct xfs_mount *bc_mp; /* file system mount struct */
union { union {
xfs_alloc_rec_t a; xfs_alloc_rec_incore_t a;
xfs_bmbt_irec_t b; xfs_bmbt_irec_t b;
xfs_inobt_rec_t i; xfs_inobt_rec_t i;
} bc_rec; /* current insert/search record value */ } bc_rec; /* current insert/search record value */

94
fs/xfs/xfs_fsops.c
Просмотреть файл

@ -191,28 +191,26 @@ xfs_growfs_data_private(
XFS_FSS_TO_BB(mp, 1), 0); XFS_FSS_TO_BB(mp, 1), 0);
agf = XFS_BUF_TO_AGF(bp); agf = XFS_BUF_TO_AGF(bp);
memset(agf, 0, mp->m_sb.sb_sectsize); memset(agf, 0, mp->m_sb.sb_sectsize);
INT_SET(agf->agf_magicnum, ARCH_CONVERT, XFS_AGF_MAGIC); agf->agf_magicnum = cpu_to_be32(XFS_AGF_MAGIC);
INT_SET(agf->agf_versionnum, ARCH_CONVERT, XFS_AGF_VERSION); agf->agf_versionnum = cpu_to_be32(XFS_AGF_VERSION);
INT_SET(agf->agf_seqno, ARCH_CONVERT, agno); agf->agf_seqno = cpu_to_be32(agno);
if (agno == nagcount - 1) if (agno == nagcount - 1)
agsize = agsize =
nb - nb -
(agno * (xfs_rfsblock_t)mp->m_sb.sb_agblocks); (agno * (xfs_rfsblock_t)mp->m_sb.sb_agblocks);
else else
agsize = mp->m_sb.sb_agblocks; agsize = mp->m_sb.sb_agblocks;
INT_SET(agf->agf_length, ARCH_CONVERT, agsize); agf->agf_length = cpu_to_be32(agsize);
INT_SET(agf->agf_roots[XFS_BTNUM_BNOi], ARCH_CONVERT, agf->agf_roots[XFS_BTNUM_BNOi] = cpu_to_be32(XFS_BNO_BLOCK(mp));
XFS_BNO_BLOCK(mp)); agf->agf_roots[XFS_BTNUM_CNTi] = cpu_to_be32(XFS_CNT_BLOCK(mp));
INT_SET(agf->agf_roots[XFS_BTNUM_CNTi], ARCH_CONVERT, agf->agf_levels[XFS_BTNUM_BNOi] = cpu_to_be32(1);
XFS_CNT_BLOCK(mp)); agf->agf_levels[XFS_BTNUM_CNTi] = cpu_to_be32(1);
INT_SET(agf->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT, 1);
INT_SET(agf->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT, 1);
agf->agf_flfirst = 0; agf->agf_flfirst = 0;
INT_SET(agf->agf_fllast, ARCH_CONVERT, XFS_AGFL_SIZE(mp) - 1); agf->agf_fllast = cpu_to_be32(XFS_AGFL_SIZE(mp) - 1);
agf->agf_flcount = 0; agf->agf_flcount = 0;
tmpsize = agsize - XFS_PREALLOC_BLOCKS(mp); tmpsize = agsize - XFS_PREALLOC_BLOCKS(mp);
INT_SET(agf->agf_freeblks, ARCH_CONVERT, tmpsize); agf->agf_freeblks = cpu_to_be32(tmpsize);
INT_SET(agf->agf_longest, ARCH_CONVERT, tmpsize); agf->agf_longest = cpu_to_be32(tmpsize);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
@ -225,19 +223,18 @@ xfs_growfs_data_private(
XFS_FSS_TO_BB(mp, 1), 0); XFS_FSS_TO_BB(mp, 1), 0);
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
memset(agi, 0, mp->m_sb.sb_sectsize); memset(agi, 0, mp->m_sb.sb_sectsize);
INT_SET(agi->agi_magicnum, ARCH_CONVERT, XFS_AGI_MAGIC); agi->agi_magicnum = cpu_to_be32(XFS_AGI_MAGIC);
INT_SET(agi->agi_versionnum, ARCH_CONVERT, XFS_AGI_VERSION); agi->agi_versionnum = cpu_to_be32(XFS_AGI_VERSION);
INT_SET(agi->agi_seqno, ARCH_CONVERT, agno); agi->agi_seqno = cpu_to_be32(agno);
INT_SET(agi->agi_length, ARCH_CONVERT, agsize); agi->agi_length = cpu_to_be32(agsize);
agi->agi_count = 0; agi->agi_count = 0;
INT_SET(agi->agi_root, ARCH_CONVERT, XFS_IBT_BLOCK(mp)); agi->agi_root = cpu_to_be32(XFS_IBT_BLOCK(mp));
INT_SET(agi->agi_level, ARCH_CONVERT, 1); agi->agi_level = cpu_to_be32(1);
agi->agi_freecount = 0; agi->agi_freecount = 0;
INT_SET(agi->agi_newino, ARCH_CONVERT, NULLAGINO); agi->agi_newino = cpu_to_be32(NULLAGINO);
INT_SET(agi->agi_dirino, ARCH_CONVERT, NULLAGINO); agi->agi_dirino = cpu_to_be32(NULLAGINO);
for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++)
INT_SET(agi->agi_unlinked[bucket], ARCH_CONVERT, agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);
NULLAGINO);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
@ -250,17 +247,16 @@ xfs_growfs_data_private(
BTOBB(mp->m_sb.sb_blocksize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, mp->m_sb.sb_blocksize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTB_MAGIC); block->bb_magic = cpu_to_be32(XFS_ABTB_MAGIC);
block->bb_level = 0; block->bb_level = 0;
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); block->bb_numrecs = cpu_to_be16(1);
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_leftsib = cpu_to_be32(NULLAGBLOCK);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_rightsib = cpu_to_be32(NULLAGBLOCK);
arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc, arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc,
block, 1, mp->m_alloc_mxr[0]); block, 1, mp->m_alloc_mxr[0]);
INT_SET(arec->ar_startblock, ARCH_CONVERT, arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp));
XFS_PREALLOC_BLOCKS(mp)); arec->ar_blockcount = cpu_to_be32(
INT_SET(arec->ar_blockcount, ARCH_CONVERT, agsize - be32_to_cpu(arec->ar_startblock));
agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT));
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
@ -273,18 +269,17 @@ xfs_growfs_data_private(
BTOBB(mp->m_sb.sb_blocksize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, mp->m_sb.sb_blocksize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_ABTC_MAGIC); block->bb_magic = cpu_to_be32(XFS_ABTC_MAGIC);
block->bb_level = 0; block->bb_level = 0;
INT_SET(block->bb_numrecs, ARCH_CONVERT, 1); block->bb_numrecs = cpu_to_be16(1);
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_leftsib = cpu_to_be32(NULLAGBLOCK);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_rightsib = cpu_to_be32(NULLAGBLOCK);
arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc, arec = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_alloc,
block, 1, mp->m_alloc_mxr[0]); block, 1, mp->m_alloc_mxr[0]);
INT_SET(arec->ar_startblock, ARCH_CONVERT, arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp));
XFS_PREALLOC_BLOCKS(mp)); arec->ar_blockcount = cpu_to_be32(
INT_SET(arec->ar_blockcount, ARCH_CONVERT, agsize - be32_to_cpu(arec->ar_startblock));
agsize - INT_GET(arec->ar_startblock, ARCH_CONVERT)); nfree += be32_to_cpu(arec->ar_blockcount);
nfree += INT_GET(arec->ar_blockcount, ARCH_CONVERT);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
@ -297,11 +292,11 @@ xfs_growfs_data_private(
BTOBB(mp->m_sb.sb_blocksize), 0); BTOBB(mp->m_sb.sb_blocksize), 0);
block = XFS_BUF_TO_SBLOCK(bp); block = XFS_BUF_TO_SBLOCK(bp);
memset(block, 0, mp->m_sb.sb_blocksize); memset(block, 0, mp->m_sb.sb_blocksize);
INT_SET(block->bb_magic, ARCH_CONVERT, XFS_IBT_MAGIC); block->bb_magic = cpu_to_be32(XFS_IBT_MAGIC);
block->bb_level = 0; block->bb_level = 0;
block->bb_numrecs = 0; block->bb_numrecs = 0;
INT_SET(block->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_leftsib = cpu_to_be32(NULLAGBLOCK);
INT_SET(block->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); block->bb_rightsib = cpu_to_be32(NULLAGBLOCK);
error = xfs_bwrite(mp, bp); error = xfs_bwrite(mp, bp);
if (error) { if (error) {
goto error0; goto error0;
@ -321,10 +316,9 @@ xfs_growfs_data_private(
} }
ASSERT(bp); ASSERT(bp);
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
INT_MOD(agi->agi_length, ARCH_CONVERT, new); be32_add(&agi->agi_length, new);
ASSERT(nagcount == oagcount || ASSERT(nagcount == oagcount ||
INT_GET(agi->agi_length, ARCH_CONVERT) == be32_to_cpu(agi->agi_length) == mp->m_sb.sb_agblocks);
mp->m_sb.sb_agblocks);
xfs_ialloc_log_agi(tp, bp, XFS_AGI_LENGTH); xfs_ialloc_log_agi(tp, bp, XFS_AGI_LENGTH);
/* /*
* Change agf length. * Change agf length.
@ -335,14 +329,14 @@ xfs_growfs_data_private(
} }
ASSERT(bp); ASSERT(bp);
agf = XFS_BUF_TO_AGF(bp); agf = XFS_BUF_TO_AGF(bp);
INT_MOD(agf->agf_length, ARCH_CONVERT, new); be32_add(&agf->agf_length, new);
ASSERT(INT_GET(agf->agf_length, ARCH_CONVERT) == ASSERT(be32_to_cpu(agf->agf_length) ==
INT_GET(agi->agi_length, ARCH_CONVERT)); be32_to_cpu(agi->agi_length));
/* /*
* Free the new space. * Free the new space.
*/ */
error = xfs_free_extent(tp, XFS_AGB_TO_FSB(mp, agno, error = xfs_free_extent(tp, XFS_AGB_TO_FSB(mp, agno,
INT_GET(agf->agf_length, ARCH_CONVERT) - new), new); be32_to_cpu(agf->agf_length) - new), new);
if (error) { if (error) {
goto error0; goto error0;
} }

74
fs/xfs/xfs_ialloc.c
Просмотреть файл

@ -178,8 +178,8 @@ xfs_ialloc_ag_alloc(
* Ideally they should be spaced out through the a.g. * Ideally they should be spaced out through the a.g.
* For now, just allocate blocks up front. * For now, just allocate blocks up front.
*/ */
args.agbno = INT_GET(agi->agi_root, ARCH_CONVERT); args.agbno = be32_to_cpu(agi->agi_root);
args.fsbno = XFS_AGB_TO_FSB(args.mp, INT_GET(agi->agi_seqno, ARCH_CONVERT), args.fsbno = XFS_AGB_TO_FSB(args.mp, be32_to_cpu(agi->agi_seqno),
args.agbno); args.agbno);
/* /*
* Allocate a fixed-size extent of inodes. * Allocate a fixed-size extent of inodes.
@ -201,9 +201,9 @@ xfs_ialloc_ag_alloc(
*/ */
if (isaligned && args.fsbno == NULLFSBLOCK) { if (isaligned && args.fsbno == NULLFSBLOCK) {
args.type = XFS_ALLOCTYPE_NEAR_BNO; args.type = XFS_ALLOCTYPE_NEAR_BNO;
args.agbno = INT_GET(agi->agi_root, ARCH_CONVERT); args.agbno = be32_to_cpu(agi->agi_root);
args.fsbno = XFS_AGB_TO_FSB(args.mp, args.fsbno = XFS_AGB_TO_FSB(args.mp,
INT_GET(agi->agi_seqno, ARCH_CONVERT), args.agbno); be32_to_cpu(agi->agi_seqno), args.agbno);
if (XFS_SB_VERSION_HASALIGN(&args.mp->m_sb) && if (XFS_SB_VERSION_HASALIGN(&args.mp->m_sb) &&
args.mp->m_sb.sb_inoalignmt >= args.mp->m_sb.sb_inoalignmt >=
XFS_B_TO_FSBT(args.mp, XFS_INODE_CLUSTER_SIZE(args.mp))) XFS_B_TO_FSBT(args.mp, XFS_INODE_CLUSTER_SIZE(args.mp)))
@ -258,7 +258,7 @@ xfs_ialloc_ag_alloc(
/* /*
* Get the block. * Get the block.
*/ */
d = XFS_AGB_TO_DADDR(args.mp, INT_GET(agi->agi_seqno, ARCH_CONVERT), d = XFS_AGB_TO_DADDR(args.mp, be32_to_cpu(agi->agi_seqno),
args.agbno + (j * blks_per_cluster)); args.agbno + (j * blks_per_cluster));
fbuf = xfs_trans_get_buf(tp, args.mp->m_ddev_targp, d, fbuf = xfs_trans_get_buf(tp, args.mp->m_ddev_targp, d,
args.mp->m_bsize * blks_per_cluster, args.mp->m_bsize * blks_per_cluster,
@ -278,17 +278,17 @@ xfs_ialloc_ag_alloc(
} }
xfs_trans_inode_alloc_buf(tp, fbuf); xfs_trans_inode_alloc_buf(tp, fbuf);
} }
INT_MOD(agi->agi_count, ARCH_CONVERT, newlen); be32_add(&agi->agi_count, newlen);
INT_MOD(agi->agi_freecount, ARCH_CONVERT, newlen); be32_add(&agi->agi_freecount, newlen);
down_read(&args.mp->m_peraglock); down_read(&args.mp->m_peraglock);
args.mp->m_perag[INT_GET(agi->agi_seqno, ARCH_CONVERT)].pagi_freecount += newlen; args.mp->m_perag[be32_to_cpu(agi->agi_seqno)].pagi_freecount += newlen;
up_read(&args.mp->m_peraglock); up_read(&args.mp->m_peraglock);
INT_SET(agi->agi_newino, ARCH_CONVERT, newino); agi->agi_newino = cpu_to_be32(newino);
/* /*
* Insert records describing the new inode chunk into the btree. * Insert records describing the new inode chunk into the btree.
*/ */
cur = xfs_btree_init_cursor(args.mp, tp, agbp, cur = xfs_btree_init_cursor(args.mp, tp, agbp,
INT_GET(agi->agi_seqno, ARCH_CONVERT), be32_to_cpu(agi->agi_seqno),
XFS_BTNUM_INO, (xfs_inode_t *)0, 0); XFS_BTNUM_INO, (xfs_inode_t *)0, 0);
for (thisino = newino; for (thisino = newino;
thisino < newino + newlen; thisino < newino + newlen;
@ -528,7 +528,7 @@ xfs_dialloc(
return 0; return 0;
} }
agi = XFS_BUF_TO_AGI(agbp); agi = XFS_BUF_TO_AGI(agbp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC);
} else { } else {
/* /*
* Continue where we left off before. In this case, we * Continue where we left off before. In this case, we
@ -536,12 +536,12 @@ xfs_dialloc(
*/ */
agbp = *IO_agbp; agbp = *IO_agbp;
agi = XFS_BUF_TO_AGI(agbp); agi = XFS_BUF_TO_AGI(agbp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC);
ASSERT(INT_GET(agi->agi_freecount, ARCH_CONVERT) > 0); ASSERT(be32_to_cpu(agi->agi_freecount) > 0);
} }
mp = tp->t_mountp; mp = tp->t_mountp;
agcount = mp->m_sb.sb_agcount; agcount = mp->m_sb.sb_agcount;
agno = INT_GET(agi->agi_seqno, ARCH_CONVERT); agno = be32_to_cpu(agi->agi_seqno);
tagno = agno; tagno = agno;
pagno = XFS_INO_TO_AGNO(mp, parent); pagno = XFS_INO_TO_AGNO(mp, parent);
pagino = XFS_INO_TO_AGINO(mp, parent); pagino = XFS_INO_TO_AGINO(mp, parent);
@ -589,7 +589,7 @@ xfs_dialloc(
* can commit the current transaction and call * can commit the current transaction and call
* us again where we left off. * us again where we left off.
*/ */
ASSERT(INT_GET(agi->agi_freecount, ARCH_CONVERT) > 0); ASSERT(be32_to_cpu(agi->agi_freecount) > 0);
*alloc_done = B_TRUE; *alloc_done = B_TRUE;
*IO_agbp = agbp; *IO_agbp = agbp;
*inop = NULLFSINO; *inop = NULLFSINO;
@ -620,7 +620,7 @@ nextag:
if (error) if (error)
goto nextag; goto nextag;
agi = XFS_BUF_TO_AGI(agbp); agi = XFS_BUF_TO_AGI(agbp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC);
} }
/* /*
* Here with an allocation group that has a free inode. * Here with an allocation group that has a free inode.
@ -629,14 +629,14 @@ nextag:
*/ */
agno = tagno; agno = tagno;
*IO_agbp = NULL; *IO_agbp = NULL;
cur = xfs_btree_init_cursor(mp, tp, agbp, INT_GET(agi->agi_seqno, ARCH_CONVERT), cur = xfs_btree_init_cursor(mp, tp, agbp, be32_to_cpu(agi->agi_seqno),
XFS_BTNUM_INO, (xfs_inode_t *)0, 0); XFS_BTNUM_INO, (xfs_inode_t *)0, 0);
/* /*
* If pagino is 0 (this is the root inode allocation) use newino. * If pagino is 0 (this is the root inode allocation) use newino.
* This must work because we've just allocated some. * This must work because we've just allocated some.
*/ */
if (!pagino) if (!pagino)
pagino = INT_GET(agi->agi_newino, ARCH_CONVERT); pagino = be32_to_cpu(agi->agi_newino);
#ifdef DEBUG #ifdef DEBUG
if (cur->bc_nlevels == 1) { if (cur->bc_nlevels == 1) {
int freecount = 0; int freecount = 0;
@ -654,7 +654,7 @@ nextag:
goto error0; goto error0;
} while (i == 1); } while (i == 1);
ASSERT(freecount == INT_GET(agi->agi_freecount, ARCH_CONVERT) || ASSERT(freecount == be32_to_cpu(agi->agi_freecount) ||
XFS_FORCED_SHUTDOWN(mp)); XFS_FORCED_SHUTDOWN(mp));
} }
#endif #endif
@ -813,9 +813,9 @@ nextag:
* In a different a.g. from the parent. * In a different a.g. from the parent.
* See if the most recently allocated block has any free. * See if the most recently allocated block has any free.
*/ */
else if (INT_GET(agi->agi_newino, ARCH_CONVERT) != NULLAGINO) { else if (be32_to_cpu(agi->agi_newino) != NULLAGINO) {
if ((error = xfs_inobt_lookup_eq(cur, if ((error = xfs_inobt_lookup_eq(cur,
INT_GET(agi->agi_newino, ARCH_CONVERT), 0, 0, &i))) be32_to_cpu(agi->agi_newino), 0, 0, &i)))
goto error0; goto error0;
if (i == 1 && if (i == 1 &&
(error = xfs_inobt_get_rec(cur, &rec.ir_startino, (error = xfs_inobt_get_rec(cur, &rec.ir_startino,
@ -862,7 +862,7 @@ nextag:
if ((error = xfs_inobt_update(cur, rec.ir_startino, rec.ir_freecount, if ((error = xfs_inobt_update(cur, rec.ir_startino, rec.ir_freecount,
rec.ir_free))) rec.ir_free)))
goto error0; goto error0;
INT_MOD(agi->agi_freecount, ARCH_CONVERT, -1); be32_add(&agi->agi_freecount, -1);
xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT);
down_read(&mp->m_peraglock); down_read(&mp->m_peraglock);
mp->m_perag[tagno].pagi_freecount--; mp->m_perag[tagno].pagi_freecount--;
@ -882,7 +882,7 @@ nextag:
if ((error = xfs_inobt_increment(cur, 0, &i))) if ((error = xfs_inobt_increment(cur, 0, &i)))
goto error0; goto error0;
} while (i == 1); } while (i == 1);
ASSERT(freecount == INT_GET(agi->agi_freecount, ARCH_CONVERT) || ASSERT(freecount == be32_to_cpu(agi->agi_freecount) ||
XFS_FORCED_SHUTDOWN(mp)); XFS_FORCED_SHUTDOWN(mp));
} }
#endif #endif
@ -970,8 +970,8 @@ xfs_difree(
return error; return error;
} }
agi = XFS_BUF_TO_AGI(agbp); agi = XFS_BUF_TO_AGI(agbp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC);
ASSERT(agbno < INT_GET(agi->agi_length, ARCH_CONVERT)); ASSERT(agbno < be32_to_cpu(agi->agi_length));
/* /*
* Initialize the cursor. * Initialize the cursor.
*/ */
@ -993,7 +993,7 @@ xfs_difree(
goto error0; goto error0;
} }
} while (i == 1); } while (i == 1);
ASSERT(freecount == INT_GET(agi->agi_freecount, ARCH_CONVERT) || ASSERT(freecount == be32_to_cpu(agi->agi_freecount) ||
XFS_FORCED_SHUTDOWN(mp)); XFS_FORCED_SHUTDOWN(mp));
} }
#endif #endif
@ -1042,8 +1042,8 @@ xfs_difree(
* to be freed when the transaction is committed. * to be freed when the transaction is committed.
*/ */
ilen = XFS_IALLOC_INODES(mp); ilen = XFS_IALLOC_INODES(mp);
INT_MOD(agi->agi_count, ARCH_CONVERT, -ilen); be32_add(&agi->agi_count, -ilen);
INT_MOD(agi->agi_freecount, ARCH_CONVERT, -(ilen - 1)); be32_add(&agi->agi_freecount, -(ilen - 1));
xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT);
down_read(&mp->m_peraglock); down_read(&mp->m_peraglock);
mp->m_perag[agno].pagi_freecount -= ilen - 1; mp->m_perag[agno].pagi_freecount -= ilen - 1;
@ -1072,7 +1072,7 @@ xfs_difree(
/* /*
* Change the inode free counts and log the ag/sb changes. * Change the inode free counts and log the ag/sb changes.
*/ */
INT_MOD(agi->agi_freecount, ARCH_CONVERT, 1); be32_add(&agi->agi_freecount, 1);
xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT);
down_read(&mp->m_peraglock); down_read(&mp->m_peraglock);
mp->m_perag[agno].pagi_freecount++; mp->m_perag[agno].pagi_freecount++;
@ -1098,7 +1098,7 @@ xfs_difree(
goto error0; goto error0;
} }
} while (i == 1); } while (i == 1);
ASSERT(freecount == INT_GET(agi->agi_freecount, ARCH_CONVERT) || ASSERT(freecount == be32_to_cpu(agi->agi_freecount) ||
XFS_FORCED_SHUTDOWN(mp)); XFS_FORCED_SHUTDOWN(mp));
} }
#endif #endif
@ -1307,7 +1307,7 @@ xfs_ialloc_log_agi(
xfs_agi_t *agi; /* allocation group header */ xfs_agi_t *agi; /* allocation group header */
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC); ASSERT(be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC);
#endif #endif
/* /*
* Compute byte offsets for the first and last fields. * Compute byte offsets for the first and last fields.
@ -1349,9 +1349,8 @@ xfs_ialloc_read_agi(
*/ */
agi = XFS_BUF_TO_AGI(bp); agi = XFS_BUF_TO_AGI(bp);
agi_ok = agi_ok =
INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC && be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC &&
XFS_AGI_GOOD_VERSION( XFS_AGI_GOOD_VERSION(be32_to_cpu(agi->agi_versionnum));
INT_GET(agi->agi_versionnum, ARCH_CONVERT));
if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IALLOC_READ_AGI, if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IALLOC_READ_AGI,
XFS_RANDOM_IALLOC_READ_AGI))) { XFS_RANDOM_IALLOC_READ_AGI))) {
XFS_CORRUPTION_ERROR("xfs_ialloc_read_agi", XFS_ERRLEVEL_LOW, XFS_CORRUPTION_ERROR("xfs_ialloc_read_agi", XFS_ERRLEVEL_LOW,
@ -1361,16 +1360,15 @@ xfs_ialloc_read_agi(
} }
pag = &mp->m_perag[agno]; pag = &mp->m_perag[agno];
if (!pag->pagi_init) { if (!pag->pagi_init) {
pag->pagi_freecount = INT_GET(agi->agi_freecount, ARCH_CONVERT); pag->pagi_freecount = be32_to_cpu(agi->agi_freecount);
pag->pagi_init = 1; pag->pagi_init = 1;
} else { } else {
/* /*
* It's possible for these to be out of sync if * It's possible for these to be out of sync if
* we are in the middle of a forced shutdown. * we are in the middle of a forced shutdown.
*/ */
ASSERT(pag->pagi_freecount == ASSERT(pag->pagi_freecount == be32_to_cpu(agi->agi_freecount) ||
INT_GET(agi->agi_freecount, ARCH_CONVERT) XFS_FORCED_SHUTDOWN(mp));
|| XFS_FORCED_SHUTDOWN(mp));
} }
#ifdef DEBUG #ifdef DEBUG

236
fs/xfs/xfs_ialloc_btree.c
Просмотреть файл

@ -118,7 +118,7 @@ xfs_inobt_delrec(
* Fail if we're off the end of the block. * Fail if we're off the end of the block.
*/ */
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
if (ptr > numrecs) { if (ptr > numrecs) {
*stat = 0; *stat = 0;
return 0; return 0;
@ -133,7 +133,7 @@ xfs_inobt_delrec(
pp = XFS_INOBT_PTR_ADDR(block, 1, cur); pp = XFS_INOBT_PTR_ADDR(block, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = ptr; i < numrecs; i++) { for (i = ptr; i < numrecs; i++) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(pp[i], ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(pp[i]), level)))
return error; return error;
} }
#endif #endif
@ -170,7 +170,7 @@ xfs_inobt_delrec(
* Decrement and log the number of entries in the block. * Decrement and log the number of entries in the block.
*/ */
numrecs--; numrecs--;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_inobt_log_block(cur->bc_tp, bp, XFS_BB_NUMRECS); xfs_inobt_log_block(cur->bc_tp, bp, XFS_BB_NUMRECS);
/* /*
* Is this the root level? If so, we're almost done. * Is this the root level? If so, we're almost done.
@ -189,9 +189,9 @@ xfs_inobt_delrec(
* pp is still set to the first pointer in the block. * pp is still set to the first pointer in the block.
* Make it the new root of the btree. * Make it the new root of the btree.
*/ */
bno = INT_GET(agi->agi_root, ARCH_CONVERT); bno = be32_to_cpu(agi->agi_root);
agi->agi_root = *pp; agi->agi_root = *pp;
INT_MOD(agi->agi_level, ARCH_CONVERT, -1); be32_add(&agi->agi_level, -1);
/* /*
* Free the block. * Free the block.
*/ */
@ -234,8 +234,8 @@ xfs_inobt_delrec(
* tree balanced. Look at the left and right sibling blocks to * tree balanced. Look at the left and right sibling blocks to
* see if we can re-balance by moving only one record. * see if we can re-balance by moving only one record.
*/ */
rbno = INT_GET(block->bb_rightsib, ARCH_CONVERT); rbno = be32_to_cpu(block->bb_rightsib);
lbno = INT_GET(block->bb_leftsib, ARCH_CONVERT); lbno = be32_to_cpu(block->bb_leftsib);
bno = NULLAGBLOCK; bno = NULLAGBLOCK;
ASSERT(rbno != NULLAGBLOCK || lbno != NULLAGBLOCK); ASSERT(rbno != NULLAGBLOCK || lbno != NULLAGBLOCK);
/* /*
@ -272,18 +272,18 @@ xfs_inobt_delrec(
/* /*
* Grab the current block number, for future use. * Grab the current block number, for future use.
*/ */
bno = INT_GET(right->bb_leftsib, ARCH_CONVERT); bno = be32_to_cpu(right->bb_leftsib);
/* /*
* If right block is full enough so that removing one entry * If right block is full enough so that removing one entry
* won't make it too empty, and left-shifting an entry out * won't make it too empty, and left-shifting an entry out
* of right to us works, we're done. * of right to us works, we're done.
*/ */
if (INT_GET(right->bb_numrecs, ARCH_CONVERT) - 1 >= if (be16_to_cpu(right->bb_numrecs) - 1 >=
XFS_INOBT_BLOCK_MINRECS(level, cur)) { XFS_INOBT_BLOCK_MINRECS(level, cur)) {
if ((error = xfs_inobt_lshift(tcur, level, &i))) if ((error = xfs_inobt_lshift(tcur, level, &i)))
goto error0; goto error0;
if (i) { if (i) {
ASSERT(INT_GET(block->bb_numrecs, ARCH_CONVERT) >= ASSERT(be16_to_cpu(block->bb_numrecs) >=
XFS_INOBT_BLOCK_MINRECS(level, cur)); XFS_INOBT_BLOCK_MINRECS(level, cur));
xfs_btree_del_cursor(tcur, xfs_btree_del_cursor(tcur,
XFS_BTREE_NOERROR); XFS_BTREE_NOERROR);
@ -300,7 +300,7 @@ xfs_inobt_delrec(
* future reference, and fix up the temp cursor to point * future reference, and fix up the temp cursor to point
* to our block again (last record). * to our block again (last record).
*/ */
rrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT); rrecs = be16_to_cpu(right->bb_numrecs);
if (lbno != NULLAGBLOCK) { if (lbno != NULLAGBLOCK) {
xfs_btree_firstrec(tcur, level); xfs_btree_firstrec(tcur, level);
if ((error = xfs_inobt_decrement(tcur, level, &i))) if ((error = xfs_inobt_decrement(tcur, level, &i)))
@ -332,18 +332,18 @@ xfs_inobt_delrec(
/* /*
* Grab the current block number, for future use. * Grab the current block number, for future use.
*/ */
bno = INT_GET(left->bb_rightsib, ARCH_CONVERT); bno = be32_to_cpu(left->bb_rightsib);
/* /*
* If left block is full enough so that removing one entry * If left block is full enough so that removing one entry
* won't make it too empty, and right-shifting an entry out * won't make it too empty, and right-shifting an entry out
* of left to us works, we're done. * of left to us works, we're done.
*/ */
if (INT_GET(left->bb_numrecs, ARCH_CONVERT) - 1 >= if (be16_to_cpu(left->bb_numrecs) - 1 >=
XFS_INOBT_BLOCK_MINRECS(level, cur)) { XFS_INOBT_BLOCK_MINRECS(level, cur)) {
if ((error = xfs_inobt_rshift(tcur, level, &i))) if ((error = xfs_inobt_rshift(tcur, level, &i)))
goto error0; goto error0;
if (i) { if (i) {
ASSERT(INT_GET(block->bb_numrecs, ARCH_CONVERT) >= ASSERT(be16_to_cpu(block->bb_numrecs) >=
XFS_INOBT_BLOCK_MINRECS(level, cur)); XFS_INOBT_BLOCK_MINRECS(level, cur));
xfs_btree_del_cursor(tcur, xfs_btree_del_cursor(tcur,
XFS_BTREE_NOERROR); XFS_BTREE_NOERROR);
@ -357,7 +357,7 @@ xfs_inobt_delrec(
* Otherwise, grab the number of records in right for * Otherwise, grab the number of records in right for
* future reference. * future reference.
*/ */
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); lrecs = be16_to_cpu(left->bb_numrecs);
} }
/* /*
* Delete the temp cursor, we're done with it. * Delete the temp cursor, we're done with it.
@ -378,14 +378,14 @@ xfs_inobt_delrec(
*/ */
rbno = bno; rbno = bno;
right = block; right = block;
rrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT); rrecs = be16_to_cpu(right->bb_numrecs);
rbp = bp; rbp = bp;
if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(mp, cur->bc_tp,
cur->bc_private.i.agno, lbno, 0, &lbp, cur->bc_private.i.agno, lbno, 0, &lbp,
XFS_INO_BTREE_REF))) XFS_INO_BTREE_REF)))
return error; return error;
left = XFS_BUF_TO_INOBT_BLOCK(lbp); left = XFS_BUF_TO_INOBT_BLOCK(lbp);
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); lrecs = be16_to_cpu(left->bb_numrecs);
if ((error = xfs_btree_check_sblock(cur, left, level, lbp))) if ((error = xfs_btree_check_sblock(cur, left, level, lbp)))
return error; return error;
} }
@ -400,14 +400,14 @@ xfs_inobt_delrec(
*/ */
lbno = bno; lbno = bno;
left = block; left = block;
lrecs = INT_GET(left->bb_numrecs, ARCH_CONVERT); lrecs = be16_to_cpu(left->bb_numrecs);
lbp = bp; lbp = bp;
if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(mp, cur->bc_tp,
cur->bc_private.i.agno, rbno, 0, &rbp, cur->bc_private.i.agno, rbno, 0, &rbp,
XFS_INO_BTREE_REF))) XFS_INO_BTREE_REF)))
return error; return error;
right = XFS_BUF_TO_INOBT_BLOCK(rbp); right = XFS_BUF_TO_INOBT_BLOCK(rbp);
rrecs = INT_GET(right->bb_numrecs, ARCH_CONVERT); rrecs = be16_to_cpu(right->bb_numrecs);
if ((error = xfs_btree_check_sblock(cur, right, level, rbp))) if ((error = xfs_btree_check_sblock(cur, right, level, rbp)))
return error; return error;
} }
@ -435,7 +435,7 @@ xfs_inobt_delrec(
rpp = XFS_INOBT_PTR_ADDR(right, 1, cur); rpp = XFS_INOBT_PTR_ADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < rrecs; i++) { for (i = 0; i < rrecs; i++) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(rpp[i], ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(rpp[i]), level)))
return error; return error;
} }
#endif #endif
@ -471,7 +471,7 @@ xfs_inobt_delrec(
* Fix up the number of records in the surviving block. * Fix up the number of records in the surviving block.
*/ */
lrecs += rrecs; lrecs += rrecs;
INT_SET(left->bb_numrecs, ARCH_CONVERT, lrecs); left->bb_numrecs = cpu_to_be16(lrecs);
/* /*
* Fix up the right block pointer in the surviving block, and log it. * Fix up the right block pointer in the surviving block, and log it.
*/ */
@ -481,18 +481,18 @@ xfs_inobt_delrec(
* If there is a right sibling now, make it point to the * If there is a right sibling now, make it point to the
* remaining block. * remaining block.
*/ */
if (INT_GET(left->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { if (be32_to_cpu(left->bb_rightsib) != NULLAGBLOCK) {
xfs_inobt_block_t *rrblock; xfs_inobt_block_t *rrblock;
xfs_buf_t *rrbp; xfs_buf_t *rrbp;
if ((error = xfs_btree_read_bufs(mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(mp, cur->bc_tp,
cur->bc_private.i.agno, INT_GET(left->bb_rightsib, ARCH_CONVERT), 0, cur->bc_private.i.agno, be32_to_cpu(left->bb_rightsib), 0,
&rrbp, XFS_INO_BTREE_REF))) &rrbp, XFS_INO_BTREE_REF)))
return error; return error;
rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp); rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp);
if ((error = xfs_btree_check_sblock(cur, rrblock, level, rrbp))) if ((error = xfs_btree_check_sblock(cur, rrblock, level, rrbp)))
return error; return error;
INT_SET(rrblock->bb_leftsib, ARCH_CONVERT, lbno); rrblock->bb_leftsib = cpu_to_be32(lbno);
xfs_inobt_log_block(cur->bc_tp, rrbp, XFS_BB_LEFTSIB); xfs_inobt_log_block(cur->bc_tp, rrbp, XFS_BB_LEFTSIB);
} }
/* /*
@ -584,7 +584,7 @@ xfs_inobt_insrec(
*/ */
bp = cur->bc_bufs[level]; bp = cur->bc_bufs[level];
block = XFS_BUF_TO_INOBT_BLOCK(bp); block = XFS_BUF_TO_INOBT_BLOCK(bp);
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_sblock(cur, block, level, bp))) if ((error = xfs_btree_check_sblock(cur, block, level, bp)))
return error; return error;
@ -658,7 +658,7 @@ xfs_inobt_insrec(
* At this point we know there's room for our new entry in the block * At this point we know there's room for our new entry in the block
* we're pointing at. * we're pointing at.
*/ */
numrecs = INT_GET(block->bb_numrecs, ARCH_CONVERT); numrecs = be16_to_cpu(block->bb_numrecs);
if (level > 0) { if (level > 0) {
/* /*
* It's a non-leaf entry. Make a hole for the new data * It's a non-leaf entry. Make a hole for the new data
@ -668,7 +668,7 @@ xfs_inobt_insrec(
pp = XFS_INOBT_PTR_ADDR(block, 1, cur); pp = XFS_INOBT_PTR_ADDR(block, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = numrecs; i >= ptr; i--) { for (i = numrecs; i >= ptr; i--) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(pp[i - 1], ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(pp[i - 1]), level)))
return error; return error;
} }
#endif #endif
@ -684,9 +684,9 @@ xfs_inobt_insrec(
return error; return error;
#endif #endif
kp[ptr - 1] = key; /* INT_: struct copy */ kp[ptr - 1] = key; /* INT_: struct copy */
INT_SET(pp[ptr - 1], ARCH_CONVERT, *bnop); pp[ptr - 1] = cpu_to_be32(*bnop);
numrecs++; numrecs++;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_inobt_log_keys(cur, bp, ptr, numrecs); xfs_inobt_log_keys(cur, bp, ptr, numrecs);
xfs_inobt_log_ptrs(cur, bp, ptr, numrecs); xfs_inobt_log_ptrs(cur, bp, ptr, numrecs);
} else { } else {
@ -702,7 +702,7 @@ xfs_inobt_insrec(
*/ */
rp[ptr - 1] = *recp; /* INT_: struct copy */ rp[ptr - 1] = *recp; /* INT_: struct copy */
numrecs++; numrecs++;
INT_SET(block->bb_numrecs, ARCH_CONVERT, numrecs); block->bb_numrecs = cpu_to_be16(numrecs);
xfs_inobt_log_recs(cur, bp, ptr, numrecs); xfs_inobt_log_recs(cur, bp, ptr, numrecs);
} }
/* /*
@ -857,8 +857,8 @@ xfs_inobt_lookup(
xfs_agi_t *agi; /* a.g. inode header */ xfs_agi_t *agi; /* a.g. inode header */
agi = XFS_BUF_TO_AGI(cur->bc_private.i.agbp); agi = XFS_BUF_TO_AGI(cur->bc_private.i.agbp);
agno = INT_GET(agi->agi_seqno, ARCH_CONVERT); agno = be32_to_cpu(agi->agi_seqno);
agbno = INT_GET(agi->agi_root, ARCH_CONVERT); agbno = be32_to_cpu(agi->agi_root);
} }
/* /*
* Iterate over each level in the btree, starting at the root. * Iterate over each level in the btree, starting at the root.
@ -925,7 +925,7 @@ xfs_inobt_lookup(
* Set low and high entry numbers, 1-based. * Set low and high entry numbers, 1-based.
*/ */
low = 1; low = 1;
if (!(high = INT_GET(block->bb_numrecs, ARCH_CONVERT))) { if (!(high = be16_to_cpu(block->bb_numrecs))) {
/* /*
* If the block is empty, the tree must * If the block is empty, the tree must
* be an empty leaf. * be an empty leaf.
@ -992,7 +992,7 @@ xfs_inobt_lookup(
*/ */
if (diff > 0 && --keyno < 1) if (diff > 0 && --keyno < 1)
keyno = 1; keyno = 1;
agbno = INT_GET(*XFS_INOBT_PTR_ADDR(block, keyno, cur), ARCH_CONVERT); agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, keyno, cur));
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_sptr(cur, agbno, level))) if ((error = xfs_btree_check_sptr(cur, agbno, level)))
return error; return error;
@ -1011,8 +1011,8 @@ xfs_inobt_lookup(
* not the last block, we're in the wrong block. * not the last block, we're in the wrong block.
*/ */
if (dir == XFS_LOOKUP_GE && if (dir == XFS_LOOKUP_GE &&
keyno > INT_GET(block->bb_numrecs, ARCH_CONVERT) && keyno > be16_to_cpu(block->bb_numrecs) &&
INT_GET(block->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { be32_to_cpu(block->bb_rightsib) != NULLAGBLOCK) {
int i; int i;
cur->bc_ptrs[0] = keyno; cur->bc_ptrs[0] = keyno;
@ -1029,7 +1029,7 @@ xfs_inobt_lookup(
/* /*
* Return if we succeeded or not. * Return if we succeeded or not.
*/ */
if (keyno == 0 || keyno > INT_GET(block->bb_numrecs, ARCH_CONVERT)) if (keyno == 0 || keyno > be16_to_cpu(block->bb_numrecs))
*stat = 0; *stat = 0;
else else
*stat = ((dir != XFS_LOOKUP_EQ) || (diff == 0)); *stat = ((dir != XFS_LOOKUP_EQ) || (diff == 0));
@ -1075,7 +1075,7 @@ xfs_inobt_lshift(
/* /*
* If we've got no left sibling then we can't shift an entry left. * If we've got no left sibling then we can't shift an entry left.
*/ */
if (INT_GET(right->bb_leftsib, ARCH_CONVERT) == NULLAGBLOCK) { if (be32_to_cpu(right->bb_leftsib) == NULLAGBLOCK) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1091,8 +1091,8 @@ xfs_inobt_lshift(
* Set up the left neighbor as "left". * Set up the left neighbor as "left".
*/ */
if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp,
cur->bc_private.i.agno, INT_GET(right->bb_leftsib, ARCH_CONVERT), 0, &lbp, cur->bc_private.i.agno, be32_to_cpu(right->bb_leftsib),
XFS_INO_BTREE_REF))) 0, &lbp, XFS_INO_BTREE_REF)))
return error; return error;
left = XFS_BUF_TO_INOBT_BLOCK(lbp); left = XFS_BUF_TO_INOBT_BLOCK(lbp);
if ((error = xfs_btree_check_sblock(cur, left, level, lbp))) if ((error = xfs_btree_check_sblock(cur, left, level, lbp)))
@ -1100,11 +1100,11 @@ xfs_inobt_lshift(
/* /*
* If it's full, it can't take another entry. * If it's full, it can't take another entry.
*/ */
if (INT_GET(left->bb_numrecs, ARCH_CONVERT) == XFS_INOBT_BLOCK_MAXRECS(level, cur)) { if (be16_to_cpu(left->bb_numrecs) == XFS_INOBT_BLOCK_MAXRECS(level, cur)) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
nrec = INT_GET(left->bb_numrecs, ARCH_CONVERT) + 1; nrec = be16_to_cpu(left->bb_numrecs) + 1;
/* /*
* If non-leaf, copy a key and a ptr to the left block. * If non-leaf, copy a key and a ptr to the left block.
*/ */
@ -1116,7 +1116,7 @@ xfs_inobt_lshift(
lpp = XFS_INOBT_PTR_ADDR(left, nrec, cur); lpp = XFS_INOBT_PTR_ADDR(left, nrec, cur);
rpp = XFS_INOBT_PTR_ADDR(right, 1, cur); rpp = XFS_INOBT_PTR_ADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_sptr(cur, INT_GET(*rpp, ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(*rpp), level)))
return error; return error;
#endif #endif
*lpp = *rpp; /* INT_: no-change copy */ *lpp = *rpp; /* INT_: no-change copy */
@ -1134,7 +1134,7 @@ xfs_inobt_lshift(
/* /*
* Bump and log left's numrecs, decrement and log right's numrecs. * Bump and log left's numrecs, decrement and log right's numrecs.
*/ */
INT_MOD(left->bb_numrecs, ARCH_CONVERT, +1); be16_add(&left->bb_numrecs, 1);
xfs_inobt_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS); xfs_inobt_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS);
#ifdef DEBUG #ifdef DEBUG
if (level > 0) if (level > 0)
@ -1142,26 +1142,26 @@ xfs_inobt_lshift(
else else
xfs_btree_check_rec(cur->bc_btnum, lrp - 1, lrp); xfs_btree_check_rec(cur->bc_btnum, lrp - 1, lrp);
#endif #endif
INT_MOD(right->bb_numrecs, ARCH_CONVERT, -1); be16_add(&right->bb_numrecs, -1);
xfs_inobt_log_block(cur->bc_tp, rbp, XFS_BB_NUMRECS); xfs_inobt_log_block(cur->bc_tp, rbp, XFS_BB_NUMRECS);
/* /*
* Slide the contents of right down one entry. * Slide the contents of right down one entry.
*/ */
if (level > 0) { if (level > 0) {
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < INT_GET(right->bb_numrecs, ARCH_CONVERT); i++) { for (i = 0; i < be16_to_cpu(right->bb_numrecs); i++) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(rpp[i + 1], ARCH_CONVERT), if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(rpp[i + 1]),
level))) level)))
return error; return error;
} }
#endif #endif
memmove(rkp, rkp + 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rkp)); memmove(rkp, rkp + 1, be16_to_cpu(right->bb_numrecs) * sizeof(*rkp));
memmove(rpp, rpp + 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rpp)); memmove(rpp, rpp + 1, be16_to_cpu(right->bb_numrecs) * sizeof(*rpp));
xfs_inobt_log_keys(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_keys(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
xfs_inobt_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_ptrs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
} else { } else {
memmove(rrp, rrp + 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rrp)); memmove(rrp, rrp + 1, be16_to_cpu(right->bb_numrecs) * sizeof(*rrp));
xfs_inobt_log_recs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
key.ir_startino = rrp->ir_startino; /* INT_: direct copy */ key.ir_startino = rrp->ir_startino; /* INT_: direct copy */
rkp = &key; rkp = &key;
} }
@ -1213,7 +1213,7 @@ xfs_inobt_newroot(
args.tp = cur->bc_tp; args.tp = cur->bc_tp;
args.mp = cur->bc_mp; args.mp = cur->bc_mp;
args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.i.agno, args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_private.i.agno,
INT_GET(agi->agi_root, ARCH_CONVERT)); be32_to_cpu(agi->agi_root));
args.mod = args.minleft = args.alignment = args.total = args.wasdel = args.mod = args.minleft = args.alignment = args.total = args.wasdel =
args.isfl = args.userdata = args.minalignslop = 0; args.isfl = args.userdata = args.minalignslop = 0;
args.minlen = args.maxlen = args.prod = 1; args.minlen = args.maxlen = args.prod = 1;
@ -1233,8 +1233,8 @@ xfs_inobt_newroot(
/* /*
* Set the root data in the a.g. inode structure. * Set the root data in the a.g. inode structure.
*/ */
INT_SET(agi->agi_root, ARCH_CONVERT, args.agbno); agi->agi_root = cpu_to_be32(args.agbno);
INT_MOD(agi->agi_level, ARCH_CONVERT, 1); be32_add(&agi->agi_level, 1);
xfs_ialloc_log_agi(args.tp, cur->bc_private.i.agbp, xfs_ialloc_log_agi(args.tp, cur->bc_private.i.agbp,
XFS_AGI_ROOT | XFS_AGI_LEVEL); XFS_AGI_ROOT | XFS_AGI_LEVEL);
/* /*
@ -1249,14 +1249,14 @@ xfs_inobt_newroot(
if ((error = xfs_btree_check_sblock(cur, block, cur->bc_nlevels - 1, bp))) if ((error = xfs_btree_check_sblock(cur, block, cur->bc_nlevels - 1, bp)))
return error; return error;
#endif #endif
if (INT_GET(block->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { if (be32_to_cpu(block->bb_rightsib) != NULLAGBLOCK) {
/* /*
* Our block is left, pick up the right block. * Our block is left, pick up the right block.
*/ */
lbp = bp; lbp = bp;
lbno = XFS_DADDR_TO_AGBNO(args.mp, XFS_BUF_ADDR(lbp)); lbno = XFS_DADDR_TO_AGBNO(args.mp, XFS_BUF_ADDR(lbp));
left = block; left = block;
rbno = INT_GET(left->bb_rightsib, ARCH_CONVERT); rbno = be32_to_cpu(left->bb_rightsib);
if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno, if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno,
rbno, 0, &rbp, XFS_INO_BTREE_REF))) rbno, 0, &rbp, XFS_INO_BTREE_REF)))
return error; return error;
@ -1273,7 +1273,7 @@ xfs_inobt_newroot(
rbp = bp; rbp = bp;
rbno = XFS_DADDR_TO_AGBNO(args.mp, XFS_BUF_ADDR(rbp)); rbno = XFS_DADDR_TO_AGBNO(args.mp, XFS_BUF_ADDR(rbp));
right = block; right = block;
lbno = INT_GET(right->bb_leftsib, ARCH_CONVERT); lbno = be32_to_cpu(right->bb_leftsib);
if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno, if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno,
lbno, 0, &lbp, XFS_INO_BTREE_REF))) lbno, 0, &lbp, XFS_INO_BTREE_REF)))
return error; return error;
@ -1287,18 +1287,18 @@ xfs_inobt_newroot(
/* /*
* Fill in the new block's btree header and log it. * Fill in the new block's btree header and log it.
*/ */
INT_SET(new->bb_magic, ARCH_CONVERT, xfs_magics[cur->bc_btnum]); new->bb_magic = cpu_to_be32(xfs_magics[cur->bc_btnum]);
INT_SET(new->bb_level, ARCH_CONVERT, (__uint16_t)cur->bc_nlevels); new->bb_level = cpu_to_be16(cur->bc_nlevels);
INT_SET(new->bb_numrecs, ARCH_CONVERT, 2); new->bb_numrecs = cpu_to_be16(2);
INT_SET(new->bb_leftsib, ARCH_CONVERT, NULLAGBLOCK); new->bb_leftsib = cpu_to_be32(NULLAGBLOCK);
INT_SET(new->bb_rightsib, ARCH_CONVERT, NULLAGBLOCK); new->bb_rightsib = cpu_to_be32(NULLAGBLOCK);
xfs_inobt_log_block(args.tp, nbp, XFS_BB_ALL_BITS); xfs_inobt_log_block(args.tp, nbp, XFS_BB_ALL_BITS);
ASSERT(lbno != NULLAGBLOCK && rbno != NULLAGBLOCK); ASSERT(lbno != NULLAGBLOCK && rbno != NULLAGBLOCK);
/* /*
* Fill in the key data in the new root. * Fill in the key data in the new root.
*/ */
kp = XFS_INOBT_KEY_ADDR(new, 1, cur); kp = XFS_INOBT_KEY_ADDR(new, 1, cur);
if (INT_GET(left->bb_level, ARCH_CONVERT) > 0) { if (be16_to_cpu(left->bb_level) > 0) {
kp[0] = *XFS_INOBT_KEY_ADDR(left, 1, cur); /* INT_: struct copy */ kp[0] = *XFS_INOBT_KEY_ADDR(left, 1, cur); /* INT_: struct copy */
kp[1] = *XFS_INOBT_KEY_ADDR(right, 1, cur); /* INT_: struct copy */ kp[1] = *XFS_INOBT_KEY_ADDR(right, 1, cur); /* INT_: struct copy */
} else { } else {
@ -1312,8 +1312,8 @@ xfs_inobt_newroot(
* Fill in the pointer data in the new root. * Fill in the pointer data in the new root.
*/ */
pp = XFS_INOBT_PTR_ADDR(new, 1, cur); pp = XFS_INOBT_PTR_ADDR(new, 1, cur);
INT_SET(pp[0], ARCH_CONVERT, lbno); pp[0] = cpu_to_be32(lbno);
INT_SET(pp[1], ARCH_CONVERT, rbno); pp[1] = cpu_to_be32(rbno);
xfs_inobt_log_ptrs(cur, nbp, 1, 2); xfs_inobt_log_ptrs(cur, nbp, 1, 2);
/* /*
* Fix up the cursor. * Fix up the cursor.
@ -1362,7 +1362,7 @@ xfs_inobt_rshift(
/* /*
* If we've got no right sibling then we can't shift an entry right. * If we've got no right sibling then we can't shift an entry right.
*/ */
if (INT_GET(left->bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK) { if (be32_to_cpu(left->bb_rightsib) == NULLAGBLOCK) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1370,7 +1370,7 @@ xfs_inobt_rshift(
* If the cursor entry is the one that would be moved, don't * If the cursor entry is the one that would be moved, don't
* do it... it's too complicated. * do it... it's too complicated.
*/ */
if (cur->bc_ptrs[level] >= INT_GET(left->bb_numrecs, ARCH_CONVERT)) { if (cur->bc_ptrs[level] >= be16_to_cpu(left->bb_numrecs)) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1378,8 +1378,8 @@ xfs_inobt_rshift(
* Set up the right neighbor as "right". * Set up the right neighbor as "right".
*/ */
if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp,
cur->bc_private.i.agno, INT_GET(left->bb_rightsib, ARCH_CONVERT), 0, &rbp, cur->bc_private.i.agno, be32_to_cpu(left->bb_rightsib),
XFS_INO_BTREE_REF))) 0, &rbp, XFS_INO_BTREE_REF)))
return error; return error;
right = XFS_BUF_TO_INOBT_BLOCK(rbp); right = XFS_BUF_TO_INOBT_BLOCK(rbp);
if ((error = xfs_btree_check_sblock(cur, right, level, rbp))) if ((error = xfs_btree_check_sblock(cur, right, level, rbp)))
@ -1387,7 +1387,7 @@ xfs_inobt_rshift(
/* /*
* If it's full, it can't take another entry. * If it's full, it can't take another entry.
*/ */
if (INT_GET(right->bb_numrecs, ARCH_CONVERT) == XFS_INOBT_BLOCK_MAXRECS(level, cur)) { if (be16_to_cpu(right->bb_numrecs) == XFS_INOBT_BLOCK_MAXRECS(level, cur)) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1396,41 +1396,41 @@ xfs_inobt_rshift(
* copy the last left block entry to the hole. * copy the last left block entry to the hole.
*/ */
if (level > 0) { if (level > 0) {
lkp = XFS_INOBT_KEY_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lkp = XFS_INOBT_KEY_ADDR(left, be16_to_cpu(left->bb_numrecs), cur);
lpp = XFS_INOBT_PTR_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lpp = XFS_INOBT_PTR_ADDR(left, be16_to_cpu(left->bb_numrecs), cur);
rkp = XFS_INOBT_KEY_ADDR(right, 1, cur); rkp = XFS_INOBT_KEY_ADDR(right, 1, cur);
rpp = XFS_INOBT_PTR_ADDR(right, 1, cur); rpp = XFS_INOBT_PTR_ADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = INT_GET(right->bb_numrecs, ARCH_CONVERT) - 1; i >= 0; i--) { for (i = be16_to_cpu(right->bb_numrecs) - 1; i >= 0; i--) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(rpp[i], ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(rpp[i]), level)))
return error; return error;
} }
#endif #endif
memmove(rkp + 1, rkp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rkp)); memmove(rkp + 1, rkp, be16_to_cpu(right->bb_numrecs) * sizeof(*rkp));
memmove(rpp + 1, rpp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rpp)); memmove(rpp + 1, rpp, be16_to_cpu(right->bb_numrecs) * sizeof(*rpp));
#ifdef DEBUG #ifdef DEBUG
if ((error = xfs_btree_check_sptr(cur, INT_GET(*lpp, ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(*lpp), level)))
return error; return error;
#endif #endif
*rkp = *lkp; /* INT_: no change copy */ *rkp = *lkp; /* INT_: no change copy */
*rpp = *lpp; /* INT_: no change copy */ *rpp = *lpp; /* INT_: no change copy */
xfs_inobt_log_keys(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_inobt_log_keys(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
xfs_inobt_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_inobt_log_ptrs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
} else { } else {
lrp = XFS_INOBT_REC_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lrp = XFS_INOBT_REC_ADDR(left, be16_to_cpu(left->bb_numrecs), cur);
rrp = XFS_INOBT_REC_ADDR(right, 1, cur); rrp = XFS_INOBT_REC_ADDR(right, 1, cur);
memmove(rrp + 1, rrp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rrp)); memmove(rrp + 1, rrp, be16_to_cpu(right->bb_numrecs) * sizeof(*rrp));
*rrp = *lrp; *rrp = *lrp;
xfs_inobt_log_recs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_inobt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs) + 1);
key.ir_startino = rrp->ir_startino; /* INT_: direct copy */ key.ir_startino = rrp->ir_startino; /* INT_: direct copy */
rkp = &key; rkp = &key;
} }
/* /*
* Decrement and log left's numrecs, bump and log right's numrecs. * Decrement and log left's numrecs, bump and log right's numrecs.
*/ */
INT_MOD(left->bb_numrecs, ARCH_CONVERT, -1); be16_add(&left->bb_numrecs, -1);
xfs_inobt_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS); xfs_inobt_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS);
INT_MOD(right->bb_numrecs, ARCH_CONVERT, +1); be16_add(&right->bb_numrecs, 1);
#ifdef DEBUG #ifdef DEBUG
if (level > 0) if (level > 0)
xfs_btree_check_key(cur->bc_btnum, rkp, rkp + 1); xfs_btree_check_key(cur->bc_btnum, rkp, rkp + 1);
@ -1522,17 +1522,17 @@ xfs_inobt_split(
/* /*
* Fill in the btree header for the new block. * Fill in the btree header for the new block.
*/ */
INT_SET(right->bb_magic, ARCH_CONVERT, xfs_magics[cur->bc_btnum]); right->bb_magic = cpu_to_be32(xfs_magics[cur->bc_btnum]);
right->bb_level = left->bb_level; /* INT_: direct copy */ right->bb_level = left->bb_level;
INT_SET(right->bb_numrecs, ARCH_CONVERT, (__uint16_t)(INT_GET(left->bb_numrecs, ARCH_CONVERT) / 2)); right->bb_numrecs = cpu_to_be16(be16_to_cpu(left->bb_numrecs) / 2);
/* /*
* Make sure that if there's an odd number of entries now, that * Make sure that if there's an odd number of entries now, that
* each new block will have the same number of entries. * each new block will have the same number of entries.
*/ */
if ((INT_GET(left->bb_numrecs, ARCH_CONVERT) & 1) && if ((be16_to_cpu(left->bb_numrecs) & 1) &&
cur->bc_ptrs[level] <= INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1) cur->bc_ptrs[level] <= be16_to_cpu(right->bb_numrecs) + 1)
INT_MOD(right->bb_numrecs, ARCH_CONVERT, +1); be16_add(&right->bb_numrecs, 1);
i = INT_GET(left->bb_numrecs, ARCH_CONVERT) - INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1; i = be16_to_cpu(left->bb_numrecs) - be16_to_cpu(right->bb_numrecs) + 1;
/* /*
* For non-leaf blocks, copy keys and addresses over to the new block. * For non-leaf blocks, copy keys and addresses over to the new block.
*/ */
@ -1542,15 +1542,15 @@ xfs_inobt_split(
rkp = XFS_INOBT_KEY_ADDR(right, 1, cur); rkp = XFS_INOBT_KEY_ADDR(right, 1, cur);
rpp = XFS_INOBT_PTR_ADDR(right, 1, cur); rpp = XFS_INOBT_PTR_ADDR(right, 1, cur);
#ifdef DEBUG #ifdef DEBUG
for (i = 0; i < INT_GET(right->bb_numrecs, ARCH_CONVERT); i++) { for (i = 0; i < be16_to_cpu(right->bb_numrecs); i++) {
if ((error = xfs_btree_check_sptr(cur, INT_GET(lpp[i], ARCH_CONVERT), level))) if ((error = xfs_btree_check_sptr(cur, be32_to_cpu(lpp[i]), level)))
return error; return error;
} }
#endif #endif
memcpy(rkp, lkp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rkp)); memcpy(rkp, lkp, be16_to_cpu(right->bb_numrecs) * sizeof(*rkp));
memcpy(rpp, lpp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rpp)); memcpy(rpp, lpp, be16_to_cpu(right->bb_numrecs) * sizeof(*rpp));
xfs_inobt_log_keys(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_keys(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
xfs_inobt_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_ptrs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
*keyp = *rkp; *keyp = *rkp;
} }
/* /*
@ -1559,36 +1559,36 @@ xfs_inobt_split(
else { else {
lrp = XFS_INOBT_REC_ADDR(left, i, cur); lrp = XFS_INOBT_REC_ADDR(left, i, cur);
rrp = XFS_INOBT_REC_ADDR(right, 1, cur); rrp = XFS_INOBT_REC_ADDR(right, 1, cur);
memcpy(rrp, lrp, INT_GET(right->bb_numrecs, ARCH_CONVERT) * sizeof(*rrp)); memcpy(rrp, lrp, be16_to_cpu(right->bb_numrecs) * sizeof(*rrp));
xfs_inobt_log_recs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT)); xfs_inobt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs));
keyp->ir_startino = rrp->ir_startino; /* INT_: direct copy */ keyp->ir_startino = rrp->ir_startino; /* INT_: direct copy */
} }
/* /*
* Find the left block number by looking in the buffer. * Find the left block number by looking in the buffer.
* Adjust numrecs, sibling pointers. * Adjust numrecs, sibling pointers.
*/ */
INT_MOD(left->bb_numrecs, ARCH_CONVERT, -(INT_GET(right->bb_numrecs, ARCH_CONVERT))); be16_add(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs)));
right->bb_rightsib = left->bb_rightsib; /* INT_: direct copy */ right->bb_rightsib = left->bb_rightsib;
INT_SET(left->bb_rightsib, ARCH_CONVERT, args.agbno); left->bb_rightsib = cpu_to_be32(args.agbno);
INT_SET(right->bb_leftsib, ARCH_CONVERT, lbno); right->bb_leftsib = cpu_to_be32(lbno);
xfs_inobt_log_block(args.tp, rbp, XFS_BB_ALL_BITS); xfs_inobt_log_block(args.tp, rbp, XFS_BB_ALL_BITS);
xfs_inobt_log_block(args.tp, lbp, XFS_BB_NUMRECS | XFS_BB_RIGHTSIB); xfs_inobt_log_block(args.tp, lbp, XFS_BB_NUMRECS | XFS_BB_RIGHTSIB);
/* /*
* If there's a block to the new block's right, make that block * If there's a block to the new block's right, make that block
* point back to right instead of to left. * point back to right instead of to left.
*/ */
if (INT_GET(right->bb_rightsib, ARCH_CONVERT) != NULLAGBLOCK) { if (be32_to_cpu(right->bb_rightsib) != NULLAGBLOCK) {
xfs_inobt_block_t *rrblock; /* rr btree block */ xfs_inobt_block_t *rrblock; /* rr btree block */
xfs_buf_t *rrbp; /* buffer for rrblock */ xfs_buf_t *rrbp; /* buffer for rrblock */
if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno, if ((error = xfs_btree_read_bufs(args.mp, args.tp, args.agno,
INT_GET(right->bb_rightsib, ARCH_CONVERT), 0, &rrbp, be32_to_cpu(right->bb_rightsib), 0, &rrbp,
XFS_INO_BTREE_REF))) XFS_INO_BTREE_REF)))
return error; return error;
rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp); rrblock = XFS_BUF_TO_INOBT_BLOCK(rrbp);
if ((error = xfs_btree_check_sblock(cur, rrblock, level, rrbp))) if ((error = xfs_btree_check_sblock(cur, rrblock, level, rrbp)))
return error; return error;
INT_SET(rrblock->bb_leftsib, ARCH_CONVERT, args.agbno); rrblock->bb_leftsib = cpu_to_be32(args.agbno);
xfs_inobt_log_block(args.tp, rrbp, XFS_BB_LEFTSIB); xfs_inobt_log_block(args.tp, rrbp, XFS_BB_LEFTSIB);
} }
/* /*
@ -1596,9 +1596,9 @@ xfs_inobt_split(
* If it's just pointing past the last entry in left, then we'll * If it's just pointing past the last entry in left, then we'll
* insert there, so don't change anything in that case. * insert there, so don't change anything in that case.
*/ */
if (cur->bc_ptrs[level] > INT_GET(left->bb_numrecs, ARCH_CONVERT) + 1) { if (cur->bc_ptrs[level] > be16_to_cpu(left->bb_numrecs) + 1) {
xfs_btree_setbuf(cur, level, rbp); xfs_btree_setbuf(cur, level, rbp);
cur->bc_ptrs[level] -= INT_GET(left->bb_numrecs, ARCH_CONVERT); cur->bc_ptrs[level] -= be16_to_cpu(left->bb_numrecs);
} }
/* /*
* If there are more levels, we'll need another cursor which refers * If there are more levels, we'll need another cursor which refers
@ -1696,7 +1696,7 @@ xfs_inobt_decrement(
/* /*
* If we just went off the left edge of the tree, return failure. * If we just went off the left edge of the tree, return failure.
*/ */
if (INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLAGBLOCK) { if (be32_to_cpu(block->bb_leftsib) == NULLAGBLOCK) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1725,7 +1725,7 @@ xfs_inobt_decrement(
xfs_agblock_t agbno; /* block number of btree block */ xfs_agblock_t agbno; /* block number of btree block */
xfs_buf_t *bp; /* buffer containing btree block */ xfs_buf_t *bp; /* buffer containing btree block */
agbno = INT_GET(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur), ARCH_CONVERT); agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur));
if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp,
cur->bc_private.i.agno, agbno, 0, &bp, cur->bc_private.i.agno, agbno, 0, &bp,
XFS_INO_BTREE_REF))) XFS_INO_BTREE_REF)))
@ -1735,7 +1735,7 @@ xfs_inobt_decrement(
block = XFS_BUF_TO_INOBT_BLOCK(bp); block = XFS_BUF_TO_INOBT_BLOCK(bp);
if ((error = xfs_btree_check_sblock(cur, block, lev, bp))) if ((error = xfs_btree_check_sblock(cur, block, lev, bp)))
return error; return error;
cur->bc_ptrs[lev] = INT_GET(block->bb_numrecs, ARCH_CONVERT); cur->bc_ptrs[lev] = be16_to_cpu(block->bb_numrecs);
} }
*stat = 1; *stat = 1;
return 0; return 0;
@ -1807,7 +1807,7 @@ xfs_inobt_get_rec(
/* /*
* Off the right end or left end, return failure. * Off the right end or left end, return failure.
*/ */
if (ptr > INT_GET(block->bb_numrecs, ARCH_CONVERT) || ptr <= 0) { if (ptr > be16_to_cpu(block->bb_numrecs) || ptr <= 0) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1855,14 +1855,14 @@ xfs_inobt_increment(
* Increment the ptr at this level. If we're still in the block * Increment the ptr at this level. If we're still in the block
* then we're done. * then we're done.
*/ */
if (++cur->bc_ptrs[level] <= INT_GET(block->bb_numrecs, ARCH_CONVERT)) { if (++cur->bc_ptrs[level] <= be16_to_cpu(block->bb_numrecs)) {
*stat = 1; *stat = 1;
return 0; return 0;
} }
/* /*
* If we just went off the right edge of the tree, return failure. * If we just went off the right edge of the tree, return failure.
*/ */
if (INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK) { if (be32_to_cpu(block->bb_rightsib) == NULLAGBLOCK) {
*stat = 0; *stat = 0;
return 0; return 0;
} }
@ -1877,7 +1877,7 @@ xfs_inobt_increment(
if ((error = xfs_btree_check_sblock(cur, block, lev, bp))) if ((error = xfs_btree_check_sblock(cur, block, lev, bp)))
return error; return error;
#endif #endif
if (++cur->bc_ptrs[lev] <= INT_GET(block->bb_numrecs, ARCH_CONVERT)) if (++cur->bc_ptrs[lev] <= be16_to_cpu(block->bb_numrecs))
break; break;
/* /*
* Read-ahead the right block, we're going to read it * Read-ahead the right block, we're going to read it
@ -1897,7 +1897,7 @@ xfs_inobt_increment(
lev > level; ) { lev > level; ) {
xfs_agblock_t agbno; /* block number of btree block */ xfs_agblock_t agbno; /* block number of btree block */
agbno = INT_GET(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur), ARCH_CONVERT); agbno = be32_to_cpu(*XFS_INOBT_PTR_ADDR(block, cur->bc_ptrs[lev], cur));
if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp, if ((error = xfs_btree_read_bufs(cur->bc_mp, cur->bc_tp,
cur->bc_private.i.agno, agbno, 0, &bp, cur->bc_private.i.agno, agbno, 0, &bp,
XFS_INO_BTREE_REF))) XFS_INO_BTREE_REF)))

8
fs/xfs/xfs_ialloc_btree.h
Просмотреть файл

@ -62,8 +62,10 @@ typedef struct xfs_inobt_key
xfs_agino_t ir_startino; /* starting inode number */ xfs_agino_t ir_startino; /* starting inode number */
} xfs_inobt_key_t; } xfs_inobt_key_t;
typedef xfs_agblock_t xfs_inobt_ptr_t; /* btree pointer type */ /* btree pointer type */
/* btree block header type */ typedef __be32 xfs_inobt_ptr_t;
/* btree block header type */
typedef struct xfs_btree_sblock xfs_inobt_block_t; typedef struct xfs_btree_sblock xfs_inobt_block_t;
#define XFS_BUF_TO_INOBT_BLOCK(bp) ((xfs_inobt_block_t *)XFS_BUF_PTR(bp)) #define XFS_BUF_TO_INOBT_BLOCK(bp) ((xfs_inobt_block_t *)XFS_BUF_PTR(bp))
@ -86,7 +88,7 @@ typedef struct xfs_btree_sblock xfs_inobt_block_t;
#define XFS_INOBT_BLOCK_MAXRECS(lev,cur) ((cur)->bc_mp->m_inobt_mxr[lev != 0]) #define XFS_INOBT_BLOCK_MAXRECS(lev,cur) ((cur)->bc_mp->m_inobt_mxr[lev != 0])
#define XFS_INOBT_BLOCK_MINRECS(lev,cur) ((cur)->bc_mp->m_inobt_mnr[lev != 0]) #define XFS_INOBT_BLOCK_MINRECS(lev,cur) ((cur)->bc_mp->m_inobt_mnr[lev != 0])
#define XFS_INOBT_IS_LAST_REC(cur) \ #define XFS_INOBT_IS_LAST_REC(cur) \
((cur)->bc_ptrs[0] == INT_GET(XFS_BUF_TO_INOBT_BLOCK((cur)->bc_bufs[0])->bb_numrecs, ARCH_CONVERT)) ((cur)->bc_ptrs[0] == be16_to_cpu(XFS_BUF_TO_INOBT_BLOCK((cur)->bc_bufs[0])->bb_numrecs))
/* /*
* Maximum number of inode btree levels. * Maximum number of inode btree levels.

22
fs/xfs/xfs_inode.c
Просмотреть файл

@ -1864,8 +1864,8 @@ xfs_iunlink(
*/ */
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
agi_ok = agi_ok =
INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC && be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC &&
XFS_AGI_GOOD_VERSION(INT_GET(agi->agi_versionnum, ARCH_CONVERT)); XFS_AGI_GOOD_VERSION(be32_to_cpu(agi->agi_versionnum));
if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IUNLINK, if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IUNLINK,
XFS_RANDOM_IUNLINK))) { XFS_RANDOM_IUNLINK))) {
XFS_CORRUPTION_ERROR("xfs_iunlink", XFS_ERRLEVEL_LOW, mp, agi); XFS_CORRUPTION_ERROR("xfs_iunlink", XFS_ERRLEVEL_LOW, mp, agi);
@ -1880,9 +1880,9 @@ xfs_iunlink(
ASSERT(agino != 0); ASSERT(agino != 0);
bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS; bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
ASSERT(agi->agi_unlinked[bucket_index]); ASSERT(agi->agi_unlinked[bucket_index]);
ASSERT(INT_GET(agi->agi_unlinked[bucket_index], ARCH_CONVERT) != agino); ASSERT(be32_to_cpu(agi->agi_unlinked[bucket_index]) != agino);
if (INT_GET(agi->agi_unlinked[bucket_index], ARCH_CONVERT) != NULLAGINO) { if (be32_to_cpu(agi->agi_unlinked[bucket_index]) != NULLAGINO) {
/* /*
* There is already another inode in the bucket we need * There is already another inode in the bucket we need
* to add ourselves to. Add us at the front of the list. * to add ourselves to. Add us at the front of the list.
@ -1909,7 +1909,7 @@ xfs_iunlink(
* Point the bucket head pointer at the inode being inserted. * Point the bucket head pointer at the inode being inserted.
*/ */
ASSERT(agino != 0); ASSERT(agino != 0);
INT_SET(agi->agi_unlinked[bucket_index], ARCH_CONVERT, agino); agi->agi_unlinked[bucket_index] = cpu_to_be32(agino);
offset = offsetof(xfs_agi_t, agi_unlinked) + offset = offsetof(xfs_agi_t, agi_unlinked) +
(sizeof(xfs_agino_t) * bucket_index); (sizeof(xfs_agino_t) * bucket_index);
xfs_trans_log_buf(tp, agibp, offset, xfs_trans_log_buf(tp, agibp, offset,
@ -1967,8 +1967,8 @@ xfs_iunlink_remove(
*/ */
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
agi_ok = agi_ok =
INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC && be32_to_cpu(agi->agi_magicnum) == XFS_AGI_MAGIC &&
XFS_AGI_GOOD_VERSION(INT_GET(agi->agi_versionnum, ARCH_CONVERT)); XFS_AGI_GOOD_VERSION(be32_to_cpu(agi->agi_versionnum));
if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IUNLINK_REMOVE, if (unlikely(XFS_TEST_ERROR(!agi_ok, mp, XFS_ERRTAG_IUNLINK_REMOVE,
XFS_RANDOM_IUNLINK_REMOVE))) { XFS_RANDOM_IUNLINK_REMOVE))) {
XFS_CORRUPTION_ERROR("xfs_iunlink_remove", XFS_ERRLEVEL_LOW, XFS_CORRUPTION_ERROR("xfs_iunlink_remove", XFS_ERRLEVEL_LOW,
@ -1986,10 +1986,10 @@ xfs_iunlink_remove(
agino = XFS_INO_TO_AGINO(mp, ip->i_ino); agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
ASSERT(agino != 0); ASSERT(agino != 0);
bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS; bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
ASSERT(INT_GET(agi->agi_unlinked[bucket_index], ARCH_CONVERT) != NULLAGINO); ASSERT(be32_to_cpu(agi->agi_unlinked[bucket_index]) != NULLAGINO);
ASSERT(agi->agi_unlinked[bucket_index]); ASSERT(agi->agi_unlinked[bucket_index]);
if (INT_GET(agi->agi_unlinked[bucket_index], ARCH_CONVERT) == agino) { if (be32_to_cpu(agi->agi_unlinked[bucket_index]) == agino) {
/* /*
* We're at the head of the list. Get the inode's * We're at the head of the list. Get the inode's
* on-disk buffer to see if there is anyone after us * on-disk buffer to see if there is anyone after us
@ -2023,7 +2023,7 @@ xfs_iunlink_remove(
*/ */
ASSERT(next_agino != 0); ASSERT(next_agino != 0);
ASSERT(next_agino != agino); ASSERT(next_agino != agino);
INT_SET(agi->agi_unlinked[bucket_index], ARCH_CONVERT, next_agino); agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino);
offset = offsetof(xfs_agi_t, agi_unlinked) + offset = offsetof(xfs_agi_t, agi_unlinked) +
(sizeof(xfs_agino_t) * bucket_index); (sizeof(xfs_agino_t) * bucket_index);
xfs_trans_log_buf(tp, agibp, offset, xfs_trans_log_buf(tp, agibp, offset,
@ -2032,7 +2032,7 @@ xfs_iunlink_remove(
/* /*
* We need to search the list for the inode being freed. * We need to search the list for the inode being freed.
*/ */
next_agino = INT_GET(agi->agi_unlinked[bucket_index], ARCH_CONVERT); next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
last_ibp = NULL; last_ibp = NULL;
while (next_agino != agino) { while (next_agino != agino) {
/* /*

2
fs/xfs/xfs_itable.c
Просмотреть файл

@ -448,7 +448,7 @@ xfs_bulkstat(
while (error) { while (error) {
agino += XFS_INODES_PER_CHUNK; agino += XFS_INODES_PER_CHUNK;
if (XFS_AGINO_TO_AGBNO(mp, agino) >= if (XFS_AGINO_TO_AGBNO(mp, agino) >=
INT_GET(agi->agi_length, ARCH_CONVERT)) be32_to_cpu(agi->agi_length))
break; break;
error = xfs_inobt_lookup_ge(cur, agino, 0, 0, error = xfs_inobt_lookup_ge(cur, agino, 0, 0,
&tmp); &tmp);

38
fs/xfs/xfs_log_recover.c
Просмотреть файл

@ -3160,13 +3160,12 @@ xlog_recover_clear_agi_bucket(
} }
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
if (INT_GET(agi->agi_magicnum, ARCH_CONVERT) != XFS_AGI_MAGIC) { if (be32_to_cpu(agi->agi_magicnum) != XFS_AGI_MAGIC) {
xfs_trans_cancel(tp, XFS_TRANS_ABORT); xfs_trans_cancel(tp, XFS_TRANS_ABORT);
return; return;
} }
ASSERT(INT_GET(agi->agi_magicnum, ARCH_CONVERT) == XFS_AGI_MAGIC);
INT_SET(agi->agi_unlinked[bucket], ARCH_CONVERT, NULLAGINO); agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);
offset = offsetof(xfs_agi_t, agi_unlinked) + offset = offsetof(xfs_agi_t, agi_unlinked) +
(sizeof(xfs_agino_t) * bucket); (sizeof(xfs_agino_t) * bucket);
xfs_trans_log_buf(tp, agibp, offset, xfs_trans_log_buf(tp, agibp, offset,
@ -3225,12 +3224,11 @@ xlog_recover_process_iunlinks(
XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp))); XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)));
} }
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
ASSERT(XFS_AGI_MAGIC == ASSERT(XFS_AGI_MAGIC == be32_to_cpu(agi->agi_magicnum));
INT_GET(agi->agi_magicnum, ARCH_CONVERT));
for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) { for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) {
agino = INT_GET(agi->agi_unlinked[bucket], ARCH_CONVERT); agino = be32_to_cpu(agi->agi_unlinked[bucket]);
while (agino != NULLAGINO) { while (agino != NULLAGINO) {
/* /*
@ -3318,8 +3316,8 @@ xlog_recover_process_iunlinks(
XFS_AGI_DADDR(mp))); XFS_AGI_DADDR(mp)));
} }
agi = XFS_BUF_TO_AGI(agibp); agi = XFS_BUF_TO_AGI(agibp);
ASSERT(XFS_AGI_MAGIC == INT_GET( ASSERT(XFS_AGI_MAGIC == be32_to_cpu(
agi->agi_magicnum, ARCH_CONVERT)); agi->agi_magicnum));
} }
} }
@ -4022,14 +4020,12 @@ xlog_recover_check_summary(
mp, agfbp, agfdaddr); mp, agfbp, agfdaddr);
} }
agfp = XFS_BUF_TO_AGF(agfbp); agfp = XFS_BUF_TO_AGF(agfbp);
ASSERT(XFS_AGF_MAGIC == ASSERT(XFS_AGF_MAGIC == be32_to_cpu(agfp->agf_magicnum));
INT_GET(agfp->agf_magicnum, ARCH_CONVERT)); ASSERT(XFS_AGF_GOOD_VERSION(be32_to_cpu(agfp->agf_versionnum)));
ASSERT(XFS_AGF_GOOD_VERSION( ASSERT(be32_to_cpu(agfp->agf_seqno) == agno);
INT_GET(agfp->agf_versionnum, ARCH_CONVERT)));
ASSERT(INT_GET(agfp->agf_seqno, ARCH_CONVERT) == agno);
freeblks += INT_GET(agfp->agf_freeblks, ARCH_CONVERT) + freeblks += be32_to_cpu(agfp->agf_freeblks) +
INT_GET(agfp->agf_flcount, ARCH_CONVERT); be32_to_cpu(agfp->agf_flcount);
xfs_buf_relse(agfbp); xfs_buf_relse(agfbp);
agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)); agidaddr = XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp));
@ -4040,14 +4036,12 @@ xlog_recover_check_summary(
mp, agibp, agidaddr); mp, agibp, agidaddr);
} }
agip = XFS_BUF_TO_AGI(agibp); agip = XFS_BUF_TO_AGI(agibp);
ASSERT(XFS_AGI_MAGIC == ASSERT(XFS_AGI_MAGIC == be32_to_cpu(agip->agi_magicnum));
INT_GET(agip->agi_magicnum, ARCH_CONVERT)); ASSERT(XFS_AGI_GOOD_VERSION(be32_to_cpu(agip->agi_versionnum)));
ASSERT(XFS_AGI_GOOD_VERSION( ASSERT(be32_to_cpu(agip->agi_seqno) == agno);
INT_GET(agip->agi_versionnum, ARCH_CONVERT)));
ASSERT(INT_GET(agip->agi_seqno, ARCH_CONVERT) == agno);
itotal += INT_GET(agip->agi_count, ARCH_CONVERT); itotal += be32_to_cpu(agip->agi_count);
ifree += INT_GET(agip->agi_freecount, ARCH_CONVERT); ifree += be32_to_cpu(agip->agi_freecount);
xfs_buf_relse(agibp); xfs_buf_relse(agibp);
} }