Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 403432dcb5daa03c1f1c961adb7d2a5daebea94b

Authored by Nathan Scott
1 parent d7929ff670
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[XFS] endianess annotations for xfs_da_node_entry_t 

SGI-PV: 943272
SGI-Modid: xfs-linux-melb:xfs-kern:25504a

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nathan Scott <nathans@sgi.com>

Showing 6 changed files with 59 additions and 60 deletions Side-by-side Diff

... ... @@ -1829,9 +1829,8 @@
1829 1829 i < INT_GET(node->hdr.count, ARCH_CONVERT);
1830 1830 btree++, i++) {
1831 1831 if (cursor->hashval
1832   - <= INT_GET(btree->hashval,
1833   - ARCH_CONVERT)) {
1834   - cursor->blkno = INT_GET(btree->before, ARCH_CONVERT);
  1832 + <= be32_to_cpu(btree->hashval)) {
  1833 + cursor->blkno = be32_to_cpu(btree->before);
1835 1834 xfs_attr_trace_l_cb("descending",
1836 1835 context, btree);
1837 1836 break;
... ... @@ -2228,8 +2227,8 @@
2228 2227 (__psunsigned_t)context->dupcnt,
2229 2228 (__psunsigned_t)context->flags,
2230 2229 (__psunsigned_t)INT_GET(node->hdr.count, ARCH_CONVERT),
2231   - (__psunsigned_t)INT_GET(node->btree[0].hashval, ARCH_CONVERT),
2232   - (__psunsigned_t)INT_GET(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval, ARCH_CONVERT));
  2230 + (__psunsigned_t)be32_to_cpu(node->btree[0].hashval),
  2231 + (__psunsigned_t)be32_to_cpu(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval));
2233 2232 }
2234 2233  
2235 2234 /*
... ... @@ -2256,8 +2255,8 @@
2256 2255 : 0,
2257 2256 (__psunsigned_t)context->dupcnt,
2258 2257 (__psunsigned_t)context->flags,
2259   - (__psunsigned_t)INT_GET(btree->hashval, ARCH_CONVERT),
2260   - (__psunsigned_t)INT_GET(btree->before, ARCH_CONVERT),
  2258 + (__psunsigned_t)be32_to_cpu(btree->hashval),
  2259 + (__psunsigned_t)be32_to_cpu(btree->before),
2261 2260 (__psunsigned_t)NULL);
2262 2261 }
2263 2262  
fs/xfs/xfs_attr_leaf.c
Diff comments   View file @ 403432d
... ... @@ -869,7 +869,7 @@
869 869 /* both on-disk, don't endian-flip twice */
870 870 node->btree[0].hashval =
871 871 leaf->entries[be16_to_cpu(leaf->hdr.count)-1 ].hashval;
872   - INT_SET(node->btree[0].before, ARCH_CONVERT, blkno);
  872 + node->btree[0].before = cpu_to_be32(blkno);
873 873 INT_SET(node->hdr.count, ARCH_CONVERT, 1);
874 874 xfs_da_log_buf(args->trans, bp1, 0, XFS_LBSIZE(dp->i_mount) - 1);
875 875 error = 0;
... ... @@ -2809,7 +2809,7 @@
2809 2809 xfs_da_brelse(*trans, bp);
2810 2810 return(0);
2811 2811 }
2812   - child_fsb = INT_GET(node->btree[0].before, ARCH_CONVERT);
  2812 + child_fsb = be32_to_cpu(node->btree[0].before);
2813 2813 xfs_da_brelse(*trans, bp); /* no locks for later trans */
2814 2814  
2815 2815 /*
... ... @@ -2869,7 +2869,7 @@
2869 2869 &bp, XFS_ATTR_FORK);
2870 2870 if (error)
2871 2871 return(error);
2872   - child_fsb = INT_GET(node->btree[i+1].before, ARCH_CONVERT);
  2872 + child_fsb = be32_to_cpu(node->btree[i+1].before);
2873 2873 xfs_da_brelse(*trans, bp);
2874 2874 }
2875 2875 /*
fs/xfs/xfs_da_btree.c
Diff comments   View file @ 403432d
... ... @@ -385,10 +385,10 @@
385 385 if (error)
386 386 return(error);
387 387 node = bp->data;
388   - INT_SET(node->btree[0].hashval, ARCH_CONVERT, blk1->hashval);
389   - INT_SET(node->btree[0].before, ARCH_CONVERT, blk1->blkno);
390   - INT_SET(node->btree[1].hashval, ARCH_CONVERT, blk2->hashval);
391   - INT_SET(node->btree[1].before, ARCH_CONVERT, blk2->blkno);
  388 + node->btree[0].hashval = cpu_to_be32(blk1->hashval);
  389 + node->btree[0].before = cpu_to_be32(blk1->blkno);
  390 + node->btree[1].hashval = cpu_to_be32(blk2->hashval);
  391 + node->btree[1].before = cpu_to_be32(blk2->blkno);
392 392 INT_SET(node->hdr.count, ARCH_CONVERT, 2);
393 393  
394 394 #ifdef DEBUG
... ... @@ -517,9 +517,9 @@
517 517 * Swap the nodes around if that makes it simpler.
518 518 */
519 519 if ((INT_GET(node1->hdr.count, ARCH_CONVERT) > 0) && (INT_GET(node2->hdr.count, ARCH_CONVERT) > 0) &&
520   - ((INT_GET(node2->btree[ 0 ].hashval, ARCH_CONVERT) < INT_GET(node1->btree[ 0 ].hashval, ARCH_CONVERT)) ||
521   - (INT_GET(node2->btree[ INT_GET(node2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) <
522   - INT_GET(node1->btree[ INT_GET(node1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))) {
  520 + ((be32_to_cpu(node2->btree[0].hashval) < be32_to_cpu(node1->btree[0].hashval)) ||
  521 + (be32_to_cpu(node2->btree[INT_GET(node2->hdr.count, ARCH_CONVERT)-1].hashval) <
  522 + be32_to_cpu(node1->btree[INT_GET(node1->hdr.count, ARCH_CONVERT)-1].hashval)))) {
523 523 tmpnode = node1;
524 524 node1 = node2;
525 525 node2 = tmpnode;
... ... @@ -596,8 +596,8 @@
596 596 */
597 597 node1 = blk1->bp->data;
598 598 node2 = blk2->bp->data;
599   - blk1->hashval = INT_GET(node1->btree[ INT_GET(node1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
600   - blk2->hashval = INT_GET(node2->btree[ INT_GET(node2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  599 + blk1->hashval = be32_to_cpu(node1->btree[ INT_GET(node1->hdr.count, ARCH_CONVERT)-1 ].hashval);
  600 + blk2->hashval = be32_to_cpu(node2->btree[ INT_GET(node2->hdr.count, ARCH_CONVERT)-1 ].hashval);
601 601  
602 602 /*
603 603 * Adjust the expected index for insertion.
... ... @@ -638,8 +638,8 @@
638 638 tmp = (INT_GET(node->hdr.count, ARCH_CONVERT) - oldblk->index) * (uint)sizeof(*btree);
639 639 memmove(btree + 1, btree, tmp);
640 640 }
641   - INT_SET(btree->hashval, ARCH_CONVERT, newblk->hashval);
642   - INT_SET(btree->before, ARCH_CONVERT, newblk->blkno);
  641 + btree->hashval = cpu_to_be32(newblk->hashval);
  642 + btree->before = cpu_to_be32(newblk->blkno);
643 643 xfs_da_log_buf(state->args->trans, oldblk->bp,
644 644 XFS_DA_LOGRANGE(node, btree, tmp + sizeof(*btree)));
645 645 INT_MOD(node->hdr.count, ARCH_CONVERT, +1);
... ... @@ -649,7 +649,7 @@
649 649 /*
650 650 * Copy the last hash value from the oldblk to propagate upwards.
651 651 */
652   - oldblk->hashval = INT_GET(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  652 + oldblk->hashval = be32_to_cpu(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval);
653 653 }
654 654  
655 655 /*========================================================================
... ... @@ -782,7 +782,7 @@
782 782 * Read in the (only) child block, then copy those bytes into
783 783 * the root block's buffer and free the original child block.
784 784 */
785   - child = INT_GET(oldroot->btree[ 0 ].before, ARCH_CONVERT);
  785 + child = be32_to_cpu(oldroot->btree[0].before);
786 786 ASSERT(child != 0);
787 787 error = xfs_da_read_buf(args->trans, args->dp, child, -1, &bp,
788 788 args->whichfork);
789 789  
790 790  
... ... @@ -974,14 +974,14 @@
974 974 node = blk->bp->data;
975 975 ASSERT(be16_to_cpu(node->hdr.info.magic) == XFS_DA_NODE_MAGIC);
976 976 btree = &node->btree[ blk->index ];
977   - if (INT_GET(btree->hashval, ARCH_CONVERT) == lasthash)
  977 + if (be32_to_cpu(btree->hashval) == lasthash)
978 978 break;
979 979 blk->hashval = lasthash;
980   - INT_SET(btree->hashval, ARCH_CONVERT, lasthash);
  980 + btree->hashval = cpu_to_be32(lasthash);
981 981 xfs_da_log_buf(state->args->trans, blk->bp,
982 982 XFS_DA_LOGRANGE(node, btree, sizeof(*btree)));
983 983  
984   - lasthash = INT_GET(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  984 + lasthash = be32_to_cpu(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval);
985 985 }
986 986 }
987 987  
... ... @@ -1022,7 +1022,7 @@
1022 1022 * Copy the last hash value from the block to propagate upwards.
1023 1023 */
1024 1024 btree--;
1025   - drop_blk->hashval = INT_GET(btree->hashval, ARCH_CONVERT);
  1025 + drop_blk->hashval = be32_to_cpu(btree->hashval);
1026 1026 }
1027 1027  
1028 1028 /*
... ... @@ -1048,9 +1048,9 @@
1048 1048 * If the dying block has lower hashvals, then move all the
1049 1049 * elements in the remaining block up to make a hole.
1050 1050 */
1051   - if ((INT_GET(drop_node->btree[ 0 ].hashval, ARCH_CONVERT) < INT_GET(save_node->btree[ 0 ].hashval, ARCH_CONVERT)) ||
1052   - (INT_GET(drop_node->btree[ INT_GET(drop_node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) <
1053   - INT_GET(save_node->btree[ INT_GET(save_node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))
  1051 + if ((be32_to_cpu(drop_node->btree[0].hashval) < be32_to_cpu(save_node->btree[ 0 ].hashval)) ||
  1052 + (be32_to_cpu(drop_node->btree[INT_GET(drop_node->hdr.count, ARCH_CONVERT)-1].hashval) <
  1053 + be32_to_cpu(save_node->btree[INT_GET(save_node->hdr.count, ARCH_CONVERT)-1 ].hashval)))
1054 1054 {
1055 1055 btree = &save_node->btree[ INT_GET(drop_node->hdr.count, ARCH_CONVERT) ];
1056 1056 tmp = INT_GET(save_node->hdr.count, ARCH_CONVERT) * (uint)sizeof(xfs_da_node_entry_t);
... ... @@ -1082,7 +1082,7 @@
1082 1082 /*
1083 1083 * Save the last hashval in the remaining block for upward propagation.
1084 1084 */
1085   - save_blk->hashval = INT_GET(save_node->btree[ INT_GET(save_node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  1085 + save_blk->hashval = be32_to_cpu(save_node->btree[ INT_GET(save_node->hdr.count, ARCH_CONVERT)-1 ].hashval);
1086 1086 }
1087 1087  
1088 1088 /*========================================================================
... ... @@ -1147,7 +1147,7 @@
1147 1147 blk->magic = be16_to_cpu(curr->magic);
1148 1148 if (blk->magic == XFS_DA_NODE_MAGIC) {
1149 1149 node = blk->bp->data;
1150   - blk->hashval = INT_GET(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  1150 + blk->hashval = be32_to_cpu(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval);
1151 1151  
1152 1152 /*
1153 1153 * Binary search. (note: small blocks will skip loop)
1154 1154  
1155 1155  
1156 1156  
1157 1157  
... ... @@ -1158,25 +1158,25 @@
1158 1158 for (btree = &node->btree[probe]; span > 4;
1159 1159 btree = &node->btree[probe]) {
1160 1160 span /= 2;
1161   - if (INT_GET(btree->hashval, ARCH_CONVERT) < hashval)
  1161 + if (be32_to_cpu(btree->hashval) < hashval)
1162 1162 probe += span;
1163   - else if (INT_GET(btree->hashval, ARCH_CONVERT) > hashval)
  1163 + else if (be32_to_cpu(btree->hashval) > hashval)
1164 1164 probe -= span;
1165 1165 else
1166 1166 break;
1167 1167 }
1168 1168 ASSERT((probe >= 0) && (probe < max));
1169   - ASSERT((span <= 4) || (INT_GET(btree->hashval, ARCH_CONVERT) == hashval));
  1169 + ASSERT((span <= 4) || (be32_to_cpu(btree->hashval) == hashval));
1170 1170  
1171 1171 /*
1172 1172 * Since we may have duplicate hashval's, find the first
1173 1173 * matching hashval in the node.
1174 1174 */
1175   - while ((probe > 0) && (INT_GET(btree->hashval, ARCH_CONVERT) >= hashval)) {
  1175 + while ((probe > 0) && (be32_to_cpu(btree->hashval) >= hashval)) {
1176 1176 btree--;
1177 1177 probe--;
1178 1178 }
1179   - while ((probe < max) && (INT_GET(btree->hashval, ARCH_CONVERT) < hashval)) {
  1179 + while ((probe < max) && (be32_to_cpu(btree->hashval) < hashval)) {
1180 1180 btree++;
1181 1181 probe++;
1182 1182 }
1183 1183  
... ... @@ -1186,10 +1186,10 @@
1186 1186 */
1187 1187 if (probe == max) {
1188 1188 blk->index = max-1;
1189   - blkno = INT_GET(node->btree[ max-1 ].before, ARCH_CONVERT);
  1189 + blkno = be32_to_cpu(node->btree[max-1].before);
1190 1190 } else {
1191 1191 blk->index = probe;
1192   - blkno = INT_GET(btree->before, ARCH_CONVERT);
  1192 + blkno = be32_to_cpu(btree->before);
1193 1193 }
1194 1194 }
1195 1195 else if (be16_to_cpu(curr->magic) == XFS_ATTR_LEAF_MAGIC) {
... ... @@ -1359,10 +1359,10 @@
1359 1359 ASSERT((be16_to_cpu(node1->hdr.info.magic) == XFS_DA_NODE_MAGIC) &&
1360 1360 (be16_to_cpu(node2->hdr.info.magic) == XFS_DA_NODE_MAGIC));
1361 1361 if ((INT_GET(node1->hdr.count, ARCH_CONVERT) > 0) && (INT_GET(node2->hdr.count, ARCH_CONVERT) > 0) &&
1362   - ((INT_GET(node2->btree[ 0 ].hashval, ARCH_CONVERT) <
1363   - INT_GET(node1->btree[ 0 ].hashval, ARCH_CONVERT)) ||
1364   - (INT_GET(node2->btree[ INT_GET(node2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) <
1365   - INT_GET(node1->btree[ INT_GET(node1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))) {
  1362 + ((be32_to_cpu(node2->btree[0].hashval) <
  1363 + be32_to_cpu(node1->btree[0].hashval)) ||
  1364 + (be32_to_cpu(node2->btree[INT_GET(node2->hdr.count, ARCH_CONVERT)-1].hashval) <
  1365 + be32_to_cpu(node1->btree[INT_GET(node1->hdr.count, ARCH_CONVERT)-1].hashval)))) {
1366 1366 return(1);
1367 1367 }
1368 1368 return(0);
... ... @@ -1382,7 +1382,7 @@
1382 1382 *count = INT_GET(node->hdr.count, ARCH_CONVERT);
1383 1383 if (!node->hdr.count)
1384 1384 return(0);
1385   - return(INT_GET(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT));
  1385 + return be32_to_cpu(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval);
1386 1386 }
1387 1387  
1388 1388 /*
1389 1389  
... ... @@ -1493,11 +1493,11 @@
1493 1493 ASSERT(be16_to_cpu(node->hdr.info.magic) == XFS_DA_NODE_MAGIC);
1494 1494 if (forward && (blk->index < INT_GET(node->hdr.count, ARCH_CONVERT)-1)) {
1495 1495 blk->index++;
1496   - blkno = INT_GET(node->btree[ blk->index ].before, ARCH_CONVERT);
  1496 + blkno = be32_to_cpu(node->btree[blk->index].before);
1497 1497 break;
1498 1498 } else if (!forward && (blk->index > 0)) {
1499 1499 blk->index--;
1500   - blkno = INT_GET(node->btree[ blk->index ].before, ARCH_CONVERT);
  1500 + blkno = be32_to_cpu(node->btree[blk->index].before);
1501 1501 break;
1502 1502 }
1503 1503 }
1504 1504  
... ... @@ -1535,12 +1535,12 @@
1535 1535 blk->magic = be16_to_cpu(info->magic);
1536 1536 if (blk->magic == XFS_DA_NODE_MAGIC) {
1537 1537 node = (xfs_da_intnode_t *)info;
1538   - blk->hashval = INT_GET(node->btree[ INT_GET(node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT);
  1538 + blk->hashval = be32_to_cpu(node->btree[INT_GET(node->hdr.count, ARCH_CONVERT)-1].hashval);
1539 1539 if (forward)
1540 1540 blk->index = 0;
1541 1541 else
1542 1542 blk->index = INT_GET(node->hdr.count, ARCH_CONVERT)-1;
1543   - blkno = INT_GET(node->btree[ blk->index ].before, ARCH_CONVERT);
  1543 + blkno = be32_to_cpu(node->btree[blk->index].before);
1544 1544 } else {
1545 1545 ASSERT(level == path->active-1);
1546 1546 blk->index = 0;
... ... @@ -1796,7 +1796,7 @@
1796 1796 ASSERT(be16_to_cpu(dead_info->magic) == XFS_DA_NODE_MAGIC);
1797 1797 dead_node = (xfs_da_intnode_t *)dead_info;
1798 1798 dead_level = INT_GET(dead_node->hdr.level, ARCH_CONVERT);
1799   - dead_hash = INT_GET(dead_node->btree[INT_GET(dead_node->hdr.count, ARCH_CONVERT) - 1].hashval, ARCH_CONVERT);
  1799 + dead_hash = be32_to_cpu(dead_node->btree[INT_GET(dead_node->hdr.count, ARCH_CONVERT) - 1].hashval);
1800 1800 }
1801 1801 sib_buf = par_buf = NULL;
1802 1802 /*
... ... @@ -1863,7 +1863,7 @@
1863 1863 level = INT_GET(par_node->hdr.level, ARCH_CONVERT);
1864 1864 for (entno = 0;
1865 1865 entno < INT_GET(par_node->hdr.count, ARCH_CONVERT) &&
1866   - INT_GET(par_node->btree[entno].hashval, ARCH_CONVERT) < dead_hash;
  1866 + be32_to_cpu(par_node->btree[entno].hashval) < dead_hash;
1867 1867 entno++)
1868 1868 continue;
1869 1869 if (unlikely(entno == INT_GET(par_node->hdr.count, ARCH_CONVERT))) {
... ... @@ -1872,7 +1872,7 @@
1872 1872 error = XFS_ERROR(EFSCORRUPTED);
1873 1873 goto done;
1874 1874 }
1875   - par_blkno = INT_GET(par_node->btree[entno].before, ARCH_CONVERT);
  1875 + par_blkno = be32_to_cpu(par_node->btree[entno].before);
1876 1876 if (level == dead_level + 1)
1877 1877 break;
1878 1878 xfs_da_brelse(tp, par_buf);
... ... @@ -1885,7 +1885,7 @@
1885 1885 for (;;) {
1886 1886 for (;
1887 1887 entno < INT_GET(par_node->hdr.count, ARCH_CONVERT) &&
1888   - INT_GET(par_node->btree[entno].before, ARCH_CONVERT) != last_blkno;
  1888 + be32_to_cpu(par_node->btree[entno].before) != last_blkno;
1889 1889 entno++)
1890 1890 continue;
1891 1891 if (entno < INT_GET(par_node->hdr.count, ARCH_CONVERT))
... ... @@ -1915,7 +1915,7 @@
1915 1915 /*
1916 1916 * Update the parent entry pointing to the moved block.
1917 1917 */
1918   - INT_SET(par_node->btree[entno].before, ARCH_CONVERT, dead_blkno);
  1918 + par_node->btree[entno].before = cpu_to_be32(dead_blkno);
1919 1919 xfs_da_log_buf(tp, par_buf,
1920 1920 XFS_DA_LOGRANGE(par_node, &par_node->btree[entno].before,
1921 1921 sizeof(par_node->btree[entno].before)));
fs/xfs/xfs_da_btree.h
Diff comments   View file @ 403432d
... ... @@ -69,8 +69,8 @@
69 69 __uint16_t level; /* level above leaves (leaf == 0) */
70 70 } hdr;
71 71 struct xfs_da_node_entry {
72   - xfs_dahash_t hashval; /* hash value for this descendant */
73   - xfs_dablk_t before; /* Btree block before this key */
  72 + __be32 hashval; /* hash value for this descendant */
  73 + __be32 before; /* Btree block before this key */
74 74 } btree[1]; /* variable sized array of keys */
75 75 } xfs_da_intnode_t;
76 76 typedef struct xfs_da_node_hdr xfs_da_node_hdr_t;
... ... @@ -954,8 +954,8 @@
954 954 btree = &node->btree[0];
955 955 xfs_dir_trace_g_dun("node: node detail", dp, uio, node);
956 956 for (i = 0; i < INT_GET(node->hdr.count, ARCH_CONVERT); btree++, i++) {
957   - if (INT_GET(btree->hashval, ARCH_CONVERT) >= cookhash) {
958   - bno = INT_GET(btree->before, ARCH_CONVERT);
  957 + if (be32_to_cpu(btree->hashval) >= cookhash) {
  958 + bno = be32_to_cpu(btree->before);
959 959 break;
960 960 }
961 961 }
962 962  
... ... @@ -1129,9 +1129,9 @@
1129 1129 (void *)(unsigned long)
1130 1130 INT_GET(node->hdr.count, ARCH_CONVERT),
1131 1131 (void *)(unsigned long)
1132   - INT_GET(node->btree[0].hashval, ARCH_CONVERT),
  1132 + be32_to_cpu(node->btree[0].hashval),
1133 1133 (void *)(unsigned long)
1134   - INT_GET(node->btree[last].hashval, ARCH_CONVERT),
  1134 + be32_to_cpu(node->btree[last].hashval),
1135 1135 NULL, NULL, NULL);
1136 1136 }
1137 1137  
fs/xfs/xfs_dir_leaf.c
Diff comments   View file @ 403432d
... ... @@ -745,7 +745,7 @@
745 745 ASSERT(be16_to_cpu(leaf->hdr.info.magic) == XFS_DIR_LEAF_MAGIC);
746 746 INT_SET(node->btree[0].hashval, ARCH_CONVERT, INT_GET(leaf->entries[ INT_GET(leaf->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT));
747 747 xfs_da_buf_done(bp2);
748   - INT_SET(node->btree[0].before, ARCH_CONVERT, blkno);
  748 + node->btree[0].before = cpu_to_be32(blkno);
749 749 INT_SET(node->hdr.count, ARCH_CONVERT, 1);
750 750 xfs_da_log_buf(args->trans, bp1,
751 751 XFS_DA_LOGRANGE(node, &node->btree[0], sizeof(node->btree[0])));