[Ocfs2-test-devel] [PATCH 1/1] Ocfs2-test: Stop using ocfs2_max_inline_data().
Tao Ma
tao.ma at oracle.com
Wed May 5 02:40:14 PDT 2010
Hi tristan,
On 05/04/2010 06:48 PM, Tristan Ye wrote:
> We're going to stop using ocfs2_max_inline_data() as libocfs2 and
> kernel both depreated it, by using a plain calculation instead.
>
> Signed-off-by: Tristan Ye<tristan.ye at oracle.com>
> ---
> programs/dx_dirs_tests/index_dir.c | 3 ++-
> programs/inline-data/inline-data-utils.c | 3 ++-
> programs/inline-data/inline-dirs-utils.c | 3 ++-
> programs/inline-data/multi-inline-dirs.c | 3 ++-
> programs/libocfs2test/file_ops.c | 3 ++-
> programs/reflink_tests/reflink_test_utils.c | 3 ++-
> 6 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/programs/dx_dirs_tests/index_dir.c b/programs/dx_dirs_tests/index_dir.c
> index b870668..f315fcf 100755
> --- a/programs/dx_dirs_tests/index_dir.c
> +++ b/programs/dx_dirs_tests/index_dir.c
> @@ -817,7 +817,8 @@ 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 = blocksize - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
why not use ocfs2_max_inline_data_with_xattr, it should work for you.
pass a NULL as the 2nd parameter.
Regards,
Tao
>
> return 0;
> }
> diff --git a/programs/inline-data/inline-data-utils.c b/programs/inline-data/inline-data-utils.c
> index bd65585..466881d 100644
> --- a/programs/inline-data/inline-data-utils.c
> +++ b/programs/inline-data/inline-data-utils.c
> @@ -364,7 +364,8 @@ 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 = blocksize - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
>
> return 0;
> }
> diff --git a/programs/inline-data/inline-dirs-utils.c b/programs/inline-data/inline-dirs-utils.c
> index ac25b3d..4bc6189 100644
> --- a/programs/inline-data/inline-dirs-utils.c
> +++ b/programs/inline-data/inline-dirs-utils.c
> @@ -503,7 +503,8 @@ 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 = blocksize - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
>
> return 0;
> }
> diff --git a/programs/inline-data/multi-inline-dirs.c b/programs/inline-data/multi-inline-dirs.c
> index 1001e06..59ec4ed 100644
> --- a/programs/inline-data/multi-inline-dirs.c
> +++ b/programs/inline-data/multi-inline-dirs.c
> @@ -1159,7 +1159,8 @@ 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 = blocksize - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
>
> return 0;
> }
> diff --git a/programs/libocfs2test/file_ops.c b/programs/libocfs2test/file_ops.c
> index d96e749..9008f6b 100644
> --- a/programs/libocfs2test/file_ops.c
> +++ b/programs/libocfs2test/file_ops.c
> @@ -353,7 +353,8 @@ 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 = *bs - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
>
> ocfs2_close(fs);
>
> diff --git a/programs/reflink_tests/reflink_test_utils.c b/programs/reflink_tests/reflink_test_utils.c
> index 96cb1da..891b81a 100755
> --- a/programs/reflink_tests/reflink_test_utils.c
> +++ b/programs/reflink_tests/reflink_test_utils.c
> @@ -1366,7 +1366,8 @@ 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 = blocksize - offsetof(struct ocfs2_dinode,
> + id2.i_data.id_data);
>
> ocfs2_close(fs);
>
More information about the Ocfs2-test-devel
mailing list