forked from pool/ocfs2-tools
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
|
From 5110de09d64c84037e7e2ecdf76ab2d0d0f77ff4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Coly Li <coly.li@suse.de>
|
||
|
|
Date: Sun, 11 Apr 2010 16:10:03 +0800
|
||
|
|
Subject: [PATCH 06/30] dx_dirs: add missing 'ocfs2_filesys *fs' parameter
|
||
|
|
|
||
|
|
This patch add 'ocfs2_filesys *fs' parameter to
|
||
|
|
ocfs2_swap_dx_root_to_cpu(), and fix the mismatched arguments when
|
||
|
|
alling ocfs2_swap_extent_list_to_cpu().
|
||
|
|
|
||
|
|
Signed-off-by: Coly Li <coly.li@suse.de>
|
||
|
|
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
|
||
|
|
---
|
||
|
|
libocfs2/dirblock.c | 7 ++++---
|
||
|
|
1 files changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libocfs2/dirblock.c b/libocfs2/dirblock.c
|
||
|
|
index 4bf48f3..06a1b64 100644
|
||
|
|
--- a/libocfs2/dirblock.c
|
||
|
|
+++ b/libocfs2/dirblock.c
|
||
|
|
@@ -254,7 +254,8 @@ static void ocfs2_swap_dx_entry_list_to_cpu(struct ocfs2_dx_entry_list *dl_list)
|
||
|
|
ocfs2_swap_dx_entry_to_cpu(&dl_list->de_entries[i]);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void ocfs2_swap_dx_root_to_cpu(struct ocfs2_dx_root_block *dx_root)
|
||
|
|
+static void ocfs2_swap_dx_root_to_cpu(ocfs2_filesys *fs,
|
||
|
|
+ struct ocfs2_dx_root_block *dx_root)
|
||
|
|
{
|
||
|
|
if (cpu_is_little_endian)
|
||
|
|
return;
|
||
|
|
@@ -272,7 +273,7 @@ static void ocfs2_swap_dx_root_to_cpu(struct ocfs2_dx_root_block *dx_root)
|
||
|
|
if (dx_root->dr_flags & OCFS2_DX_FLAG_INLINE)
|
||
|
|
ocfs2_swap_dx_entry_list_to_cpu(&dx_root->dr_entries);
|
||
|
|
else
|
||
|
|
- ocfs2_swap_extent_list_to_cpu(&dx_root->dr_list);
|
||
|
|
+ ocfs2_swap_extent_list_to_cpu(fs, dx_root, &dx_root->dr_list);
|
||
|
|
}
|
||
|
|
|
||
|
|
errcode_t ocfs2_read_dx_root(ocfs2_filesys *fs, uint64_t block,
|
||
|
|
@@ -294,7 +295,7 @@ errcode_t ocfs2_read_dx_root(ocfs2_filesys *fs, uint64_t block,
|
||
|
|
strlen(OCFS2_DX_ROOT_SIGNATURE)))
|
||
|
|
return OCFS2_ET_DIR_CORRUPTED;
|
||
|
|
|
||
|
|
- ocfs2_swap_dx_root_to_cpu(dx_root);
|
||
|
|
+ ocfs2_swap_dx_root_to_cpu(fs, dx_root);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.0.2
|
||
|
|
|