[Ocfs2-test-devel] [PATCH 1/1] Ocfs2-test: Stop using ocfs2_max_inline_data().

Tristan Ye tristan.ye at oracle.com
Wed May 5 20:00:54 PDT 2010


We're going to stop using ocfs2_max_inline_data() as libocfs2 and
kernel both depreated it, by using ocfs2_max_inline_data_with_xattr()
instead.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/dx_dirs_tests/index_dir.c          |    2 +-
 programs/inline-data/inline-data-utils.c    |    2 +-
 programs/inline-data/inline-dirs-utils.c    |    2 +-
 programs/inline-data/multi-inline-dirs.c    |    2 +-
 programs/libocfs2test/file_ops.c            |    2 +-
 programs/reflink_tests/reflink_test_utils.c |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/programs/dx_dirs_tests/index_dir.c b/programs/dx_dirs_tests/index_dir.c
index b870668..75ea8bd 100755
--- a/programs/dx_dirs_tests/index_dir.c
+++ b/programs/dx_dirs_tests/index_dir.c
@@ -817,7 +817,7 @@ int open_ocfs2_volume(char *device_name)
 
         blocksize = 1 << ocfs2_sb->s_blocksize_bits;
         clustersize = 1 << ocfs2_sb->s_clustersize_bits;
-        max_inline_size = ocfs2_max_inline_data(blocksize);
+        max_inline_size = ocfs2_max_inline_data_with_xattr(blocksize, NULL);
 
         return 0;
 }
diff --git a/programs/inline-data/inline-data-utils.c b/programs/inline-data/inline-data-utils.c
index bd65585..e3de113 100644
--- a/programs/inline-data/inline-data-utils.c
+++ b/programs/inline-data/inline-data-utils.c
@@ -364,7 +364,7 @@ int open_ocfs2_volume(char *device_name)
 
 	blocksize = 1 << ocfs2_sb->s_blocksize_bits;
 	clustersize = 1 << ocfs2_sb->s_clustersize_bits;
-	max_inline_size = ocfs2_max_inline_data(blocksize);
+	max_inline_size = ocfs2_max_inline_data_with_xattr(blocksize, NULL);
 
 	return 0;
 }
diff --git a/programs/inline-data/inline-dirs-utils.c b/programs/inline-data/inline-dirs-utils.c
index ac25b3d..e0d0545 100644
--- a/programs/inline-data/inline-dirs-utils.c
+++ b/programs/inline-data/inline-dirs-utils.c
@@ -503,7 +503,7 @@ int open_ocfs2_volume(char *device_name)
 
 	blocksize = 1 << ocfs2_sb->s_blocksize_bits;
 	clustersize = 1 << ocfs2_sb->s_clustersize_bits;
-	max_inline_size = ocfs2_max_inline_data(blocksize);
+	max_inline_size = ocfs2_max_inline_data_with_xattr(blocksize, NULL);
 
 	return 0;
 }
diff --git a/programs/inline-data/multi-inline-dirs.c b/programs/inline-data/multi-inline-dirs.c
index 1001e06..c6137e1 100644
--- a/programs/inline-data/multi-inline-dirs.c
+++ b/programs/inline-data/multi-inline-dirs.c
@@ -1159,7 +1159,7 @@ static int open_ocfs2_volume(char *device_name)
 
 	blocksize = 1 << ocfs2_sb->s_blocksize_bits;
 	clustersize = 1 << ocfs2_sb->s_clustersize_bits;
-	max_inline_size = ocfs2_max_inline_data(blocksize);
+	max_inline_size = ocfs2_max_inline_data_with_xattr(blocksize, NULL);
 
 	return 0;
 }
diff --git a/programs/libocfs2test/file_ops.c b/programs/libocfs2test/file_ops.c
index d96e749..b6dfe40 100644
--- a/programs/libocfs2test/file_ops.c
+++ b/programs/libocfs2test/file_ops.c
@@ -353,7 +353,7 @@ int get_bs_cs(char *device_name, unsigned int *bs, unsigned long *cs,
 
 	*bs = fs->fs_blocksize;
 	*cs = fs->fs_clustersize;
-	*max_inline_sz = ocfs2_max_inline_data(*bs);
+	*max_inline_sz = ocfs2_max_inline_data_with_xattr(*bs, NULL);
 
 	ocfs2_close(fs);
 
diff --git a/programs/reflink_tests/reflink_test_utils.c b/programs/reflink_tests/reflink_test_utils.c
index 96cb1da..13ef58f 100755
--- a/programs/reflink_tests/reflink_test_utils.c
+++ b/programs/reflink_tests/reflink_test_utils.c
@@ -1366,7 +1366,7 @@ int open_ocfs2_volume(char *device_name)
 
 	blocksize = 1 << ocfs2_sb->s_blocksize_bits;
 	clustersize = 1 << ocfs2_sb->s_clustersize_bits;
-	max_inline_size = ocfs2_max_inline_data(blocksize);
+	max_inline_size = ocfs2_max_inline_data_with_xattr(blocksize, NULL);
 
 	ocfs2_close(fs);
 
-- 
1.5.5




More information about the Ocfs2-test-devel mailing list