btrfs: Cleanup for using BTRFS_SETGET_STACK instead of raw convert

Some codes still use the cpu_to_lexx instead of the
BTRFS_SETGET_STACK_FUNCS declared in ctree.h.

Also added some BTRFS_SETGET_STACK_FUNCS for btrfs_header btrfs_timespec
and other structures.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Miao Xie <miaoxie@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 64a157becbe5..266f24febce3 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1345,12 +1345,12 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,
                 mapped_buffer = kmap_atomic(sblock->pagev[0]->page);
                 h = (struct btrfs_header *)mapped_buffer;
 
-                if (sblock->pagev[0]->logical != le64_to_cpu(h->bytenr) ||
+                if (sblock->pagev[0]->logical != btrfs_stack_header_bytenr(h) ||
                     memcmp(h->fsid, fs_info->fsid, BTRFS_UUID_SIZE) ||
                     memcmp(h->chunk_tree_uuid, fs_info->chunk_tree_uuid,
                            BTRFS_UUID_SIZE)) {
                         sblock->header_error = 1;
-                } else if (generation != le64_to_cpu(h->generation)) {
+                } else if (generation != btrfs_stack_header_generation(h)) {
                         sblock->header_error = 1;
                         sblock->generation_error = 1;
                 }
@@ -1720,10 +1720,10 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock)
          * b) the page is already kmapped
          */
 
-        if (sblock->pagev[0]->logical != le64_to_cpu(h->bytenr))
+        if (sblock->pagev[0]->logical != btrfs_stack_header_bytenr(h))
                 ++fail;
 
-        if (sblock->pagev[0]->generation != le64_to_cpu(h->generation))
+        if (sblock->pagev[0]->generation != btrfs_stack_header_generation(h))
                 ++fail;
 
         if (memcmp(h->fsid, fs_info->fsid, BTRFS_UUID_SIZE))
@@ -1786,10 +1786,10 @@ static int scrub_checksum_super(struct scrub_block *sblock)
         s = (struct btrfs_super_block *)mapped_buffer;
         memcpy(on_disk_csum, s->csum, sctx->csum_size);
 
-        if (sblock->pagev[0]->logical != le64_to_cpu(s->bytenr))
+        if (sblock->pagev[0]->logical != btrfs_super_bytenr(s))
                 ++fail_cor;
 
-        if (sblock->pagev[0]->generation != le64_to_cpu(s->generation))
+        if (sblock->pagev[0]->generation != btrfs_super_generation(s))
                 ++fail_gen;
 
         if (memcmp(s->fsid, fs_info->fsid, BTRFS_UUID_SIZE))