From 25a36d277be36c5143a7583d4c5c46380afa0fdc Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Sun, 31 Mar 2013 12:52:14 +0530 Subject: [PATCH] LU-2038 osd: Rename do_*punch to dbo_*punch Minor fix where dt_body_operations::do_punch and dt_body_operations::do_declare_punch were renamed to dt_body_operations::dbo_punch and dt_body_operations::dbo_declare_punch, respectively, to keep the field names consistent. Signed-off-by: Girish Shilamkar Change-Id: Id807805bd69bb20460898552830a658d8a25c238 Reviewed-on: http://review.whamcloud.com/5895 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Li Wei Reviewed-by: Alex Zhuravlev Reviewed-by: Andreas Dilger --- lustre/doc/osd-api.txt | 4 ++-- lustre/include/dt_object.h | 12 ++++++------ lustre/osd-ldiskfs/osd_io.c | 4 ++-- lustre/osd-zfs/osd_io.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lustre/doc/osd-api.txt b/lustre/doc/osd-api.txt index 7e3bf88..340a255 100644 --- a/lustre/doc/osd-api.txt +++ b/lustre/doc/osd-api.txt @@ -807,9 +807,9 @@ int (*dbo_read_prep)(const struct lu_env *, struct dt_object *, struct niobuf_local *, int); int (*dbo_fiemap_get)(const struct lu_env *, struct dt_object *, struct ll_user_fiemap *); -int (*do_declare_punch)(const struct lu_env*, struct dt_object *, __u64, +int (*dbo_declare_punch)(const struct lu_env*, struct dt_object *, __u64, __u64,struct thandle *); -int (*do_punch)(const struct lu_env *, struct dt_object *, __u64, __u64, +int (*dbo_punch)(const struct lu_env *, struct dt_object *, __u64, __u64, struct thandle *, struct lustre_capa *); dbo_read diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h index db982f4..70545e4 100644 --- a/lustre/include/dt_object.h +++ b/lustre/include/dt_object.h @@ -527,9 +527,9 @@ struct dt_body_operations { * Punch object's content * precondition: regular object, not index */ - int (*do_declare_punch)(const struct lu_env *, struct dt_object *, + int (*dbo_declare_punch)(const struct lu_env *, struct dt_object *, __u64, __u64, struct thandle *th); - int (*do_punch)(const struct lu_env *env, struct dt_object *dt, + int (*dbo_punch)(const struct lu_env *env, struct dt_object *dt, __u64 start, __u64 end, struct thandle *th, struct lustre_capa *capa); }; @@ -1222,8 +1222,8 @@ static inline int dt_declare_punch(const struct lu_env *env, { LASSERT(dt); LASSERT(dt->do_body_ops); - LASSERT(dt->do_body_ops->do_declare_punch); - return dt->do_body_ops->do_declare_punch(env, dt, start, end, th); + LASSERT(dt->do_body_ops->dbo_declare_punch); + return dt->do_body_ops->dbo_declare_punch(env, dt, start, end, th); } static inline int dt_punch(const struct lu_env *env, struct dt_object *dt, @@ -1232,8 +1232,8 @@ static inline int dt_punch(const struct lu_env *env, struct dt_object *dt, { LASSERT(dt); LASSERT(dt->do_body_ops); - LASSERT(dt->do_body_ops->do_punch); - return dt->do_body_ops->do_punch(env, dt, start, end, th, capa); + LASSERT(dt->do_body_ops->dbo_punch); + return dt->do_body_ops->dbo_punch(env, dt, start, end, th, capa); } static inline int dt_fiemap_get(const struct lu_env *env, struct dt_object *d, diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c index 091feb6..1de75ab9 100644 --- a/lustre/osd-ldiskfs/osd_io.c +++ b/lustre/osd-ldiskfs/osd_io.c @@ -1332,8 +1332,8 @@ const struct dt_body_operations osd_body_ops = { .dbo_declare_write_commit = osd_declare_write_commit, .dbo_write_commit = osd_write_commit, .dbo_read_prep = osd_read_prep, - .do_declare_punch = osd_declare_punch, - .do_punch = osd_punch, + .dbo_declare_punch = osd_declare_punch, + .dbo_punch = osd_punch, .dbo_fiemap_get = osd_fiemap_get, }; diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c index 5ec8a33..ea34852 100644 --- a/lustre/osd-zfs/osd_io.c +++ b/lustre/osd-zfs/osd_io.c @@ -869,7 +869,7 @@ struct dt_body_operations osd_body_ops = { .dbo_declare_write_commit = osd_declare_write_commit, .dbo_write_commit = osd_write_commit, .dbo_read_prep = osd_read_prep, - .do_declare_punch = osd_declare_punch, - .do_punch = osd_punch, + .dbo_declare_punch = osd_declare_punch, + .dbo_punch = osd_punch, }; -- 1.8.3.1