diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-02-13 16:34:20 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2008-02-13 16:34:20 -0500 |
commit | 891456227881da9c565c455010380a40d385a478 (patch) | |
tree | 6dfa9346adb0bb8aef5420ff172216d763cb4bff /fs/jfs/jfs_xtree.c | |
parent | 96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff) |
jfs: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: jfs-discussion@lists.sourceforge.net
Diffstat (limited to 'fs/jfs/jfs_xtree.c')
-rw-r--r-- | fs/jfs/jfs_xtree.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c index a000aaa75136..5a61ebf2cbcc 100644 --- a/fs/jfs/jfs_xtree.c +++ b/fs/jfs/jfs_xtree.c | |||
@@ -905,8 +905,7 @@ int xtInsert(tid_t tid, /* transaction id */ | |||
905 | XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr); | 905 | XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr); |
906 | 906 | ||
907 | /* advance next available entry index */ | 907 | /* advance next available entry index */ |
908 | p->header.nextindex = | 908 | le16_add_cpu(&p->header.nextindex, 1); |
909 | cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1); | ||
910 | 909 | ||
911 | /* Don't log it if there are no links to the file */ | 910 | /* Don't log it if there are no links to the file */ |
912 | if (!test_cflag(COMMIT_Nolink, ip)) { | 911 | if (!test_cflag(COMMIT_Nolink, ip)) { |
@@ -997,8 +996,7 @@ xtSplitUp(tid_t tid, | |||
997 | split->addr); | 996 | split->addr); |
998 | 997 | ||
999 | /* advance next available entry index */ | 998 | /* advance next available entry index */ |
1000 | sp->header.nextindex = | 999 | le16_add_cpu(&sp->header.nextindex, 1); |
1001 | cpu_to_le16(le16_to_cpu(sp->header.nextindex) + 1); | ||
1002 | 1000 | ||
1003 | /* Don't log it if there are no links to the file */ | 1001 | /* Don't log it if there are no links to the file */ |
1004 | if (!test_cflag(COMMIT_Nolink, ip)) { | 1002 | if (!test_cflag(COMMIT_Nolink, ip)) { |
@@ -1167,9 +1165,7 @@ xtSplitUp(tid_t tid, | |||
1167 | JFS_SBI(ip->i_sb)->nbperpage, rcbn); | 1165 | JFS_SBI(ip->i_sb)->nbperpage, rcbn); |
1168 | 1166 | ||
1169 | /* advance next available entry index. */ | 1167 | /* advance next available entry index. */ |
1170 | sp->header.nextindex = | 1168 | le16_add_cpu(&sp->header.nextindex, 1); |
1171 | cpu_to_le16(le16_to_cpu(sp->header.nextindex) + | ||
1172 | 1); | ||
1173 | 1169 | ||
1174 | /* Don't log it if there are no links to the file */ | 1170 | /* Don't log it if there are no links to the file */ |
1175 | if (!test_cflag(COMMIT_Nolink, ip)) { | 1171 | if (!test_cflag(COMMIT_Nolink, ip)) { |
@@ -1738,8 +1734,7 @@ int xtExtend(tid_t tid, /* transaction id */ | |||
1738 | XT_PUTENTRY(xad, XAD_NEW, xoff, len, xaddr); | 1734 | XT_PUTENTRY(xad, XAD_NEW, xoff, len, xaddr); |
1739 | 1735 | ||
1740 | /* advance next available entry index */ | 1736 | /* advance next available entry index */ |
1741 | p->header.nextindex = | 1737 | le16_add_cpu(&p->header.nextindex, 1); |
1742 | cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1); | ||
1743 | } | 1738 | } |
1744 | 1739 | ||
1745 | /* get back old entry */ | 1740 | /* get back old entry */ |
@@ -1905,8 +1900,7 @@ printf("xtTailgate: xoff:0x%lx xlen:0x%x xaddr:0x%lx\n", | |||
1905 | XT_PUTENTRY(xad, XAD_NEW, xoff, xlen, xaddr); | 1900 | XT_PUTENTRY(xad, XAD_NEW, xoff, xlen, xaddr); |
1906 | 1901 | ||
1907 | /* advance next available entry index */ | 1902 | /* advance next available entry index */ |
1908 | p->header.nextindex = | 1903 | le16_add_cpu(&p->header.nextindex, 1); |
1909 | cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1); | ||
1910 | } | 1904 | } |
1911 | 1905 | ||
1912 | /* get back old XAD */ | 1906 | /* get back old XAD */ |
@@ -2567,8 +2561,7 @@ int xtAppend(tid_t tid, /* transaction id */ | |||
2567 | XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr); | 2561 | XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr); |
2568 | 2562 | ||
2569 | /* advance next available entry index */ | 2563 | /* advance next available entry index */ |
2570 | p->header.nextindex = | 2564 | le16_add_cpu(&p->header.nextindex, 1); |
2571 | cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1); | ||
2572 | 2565 | ||
2573 | xtlck->lwm.offset = | 2566 | xtlck->lwm.offset = |
2574 | (xtlck->lwm.offset) ? min(index,(int) xtlck->lwm.offset) : index; | 2567 | (xtlck->lwm.offset) ? min(index,(int) xtlck->lwm.offset) : index; |
@@ -2631,8 +2624,7 @@ int xtDelete(tid_t tid, struct inode *ip, s64 xoff, s32 xlen, int flag) | |||
2631 | * delete the entry from the leaf page | 2624 | * delete the entry from the leaf page |
2632 | */ | 2625 | */ |
2633 | nextindex = le16_to_cpu(p->header.nextindex); | 2626 | nextindex = le16_to_cpu(p->header.nextindex); |
2634 | p->header.nextindex = | 2627 | le16_add_cpu(&p->header.nextindex, -1); |
2635 | cpu_to_le16(le16_to_cpu(p->header.nextindex) - 1); | ||
2636 | 2628 | ||
2637 | /* | 2629 | /* |
2638 | * if the leaf page bocome empty, free the page | 2630 | * if the leaf page bocome empty, free the page |
@@ -2795,9 +2787,7 @@ xtDeleteUp(tid_t tid, struct inode *ip, | |||
2795 | (nextindex - index - | 2787 | (nextindex - index - |
2796 | 1) << L2XTSLOTSIZE); | 2788 | 1) << L2XTSLOTSIZE); |
2797 | 2789 | ||
2798 | p->header.nextindex = | 2790 | le16_add_cpu(&p->header.nextindex, -1); |
2799 | cpu_to_le16(le16_to_cpu(p->header.nextindex) - | ||
2800 | 1); | ||
2801 | jfs_info("xtDeleteUp(entry): 0x%lx[%d]", | 2791 | jfs_info("xtDeleteUp(entry): 0x%lx[%d]", |
2802 | (ulong) parent->bn, index); | 2792 | (ulong) parent->bn, index); |
2803 | } | 2793 | } |