LU-6142 lov: make various lov_object.c function static.

These function in lov_object.c and lovsub_object.c are only
used in the file in which they are defined.
So mark them as static.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I958f4e850d13d2ced32772e0e66627eb40a1bf36
Reviewed-on: https://review.whamcloud.com/39385
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Lai Siyao <lai.siyao@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.super@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/lov/lov_cl_internal.h b/lustre/lov/lov_cl_internal.h
index 083b5ba..707333f 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -596,15 +596,6 @@ extern struct kmem_cache *lov_session_kmem;
 
 extern struct kmem_cache *lovsub_object_kmem;
 
-int   lov_object_init     (const struct lu_env *env, struct lu_object *obj,
-                           const struct lu_object_conf *conf);
-int   lovsub_object_init  (const struct lu_env *env, struct lu_object *obj,
-                           const struct lu_object_conf *conf);
-int   lov_lock_init       (const struct lu_env *env, struct cl_object *obj,
-                           struct cl_lock *lock, const struct cl_io *io);
-int   lov_io_init         (const struct lu_env *env, struct cl_object *obj,
-                           struct cl_io *io);
-
 int   lov_lock_init_composite(const struct lu_env *env, struct cl_object *obj,
                            struct cl_lock *lock, const struct cl_io *io);
 int   lov_lock_init_empty (const struct lu_env *env, struct cl_object *obj,
@@ -619,8 +610,6 @@ int   lov_io_init_released(const struct lu_env *env, struct cl_object *obj,
 struct lov_io_sub *lov_sub_get(const struct lu_env *env, struct lov_io *lio,
                                int stripe);
 
-int   lov_page_init       (const struct lu_env *env, struct cl_object *ob,
-                          struct cl_page *page, pgoff_t index);
 int   lov_page_init_empty (const struct lu_env *env, struct cl_object *obj,
                           struct cl_page *page, pgoff_t index);
 int   lov_page_init_composite(const struct lu_env *env, struct cl_object *obj,
@@ -635,7 +624,6 @@ struct lu_object *lovsub_object_alloc(const struct lu_env *env,
                                       const struct lu_object_header *hdr,
                                       struct lu_device *dev);
 
-struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov);
 int lov_page_stripe(const struct cl_page *page);
 bool lov_page_is_empty(const struct cl_page *page);
 int lov_lsm_entry(const struct lov_stripe_md *lsm, __u64 offset);

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 0e39826..053aae7 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -81,6 +81,7 @@ struct lov_layout_operations {
 };
 
 static int lov_layout_wait(const struct lu_env *env, struct lov_object *lov);
+static struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov);
 
 static void lov_lsm_put(struct lov_stripe_md *lsm)
 {
@@ -1293,8 +1294,8 @@ out:
  * Lov object operations.
  *
  */
-int lov_object_init(const struct lu_env *env, struct lu_object *obj,
-                   const struct lu_object_conf *conf)
+static int lov_object_init(const struct lu_env *env, struct lu_object *obj,
+                          const struct lu_object_conf *conf)
 {
        struct lov_object            *lov   = lu2lov(obj);
        struct lov_device            *dev   = lov_object_dev(lov);
@@ -1424,8 +1425,8 @@ static int lov_object_print(const struct lu_env *env, void *cookie,
         return LOV_2DISPATCH_NOLOCK(lu2lov(o), llo_print, env, cookie, p, o);
 }
 
-int lov_page_init(const struct lu_env *env, struct cl_object *obj,
-                 struct cl_page *page, pgoff_t index)
+static int lov_page_init(const struct lu_env *env, struct cl_object *obj,
+                        struct cl_page *page, pgoff_t index)
 {
        return LOV_2DISPATCH_NOLOCK(cl2lov(obj), llo_page_init, env, obj, page,
                                    index);
@@ -1435,8 +1436,8 @@ int lov_page_init(const struct lu_env *env, struct cl_object *obj,
  * Implements cl_object_operations::clo_io_init() method for lov
  * layer. Dispatches to the appropriate layout io initialization method.
  */
-int lov_io_init(const struct lu_env *env, struct cl_object *obj,
-               struct cl_io *io)
+static int lov_io_init(const struct lu_env *env, struct cl_object *obj,
+                      struct cl_io *io)
 {
        CL_IO_SLICE_CLEAN(lov_env_io(env), lis_preserved);
 
@@ -1475,7 +1476,7 @@ static int lov_attr_update(const struct lu_env *env, struct cl_object *obj,
        return 0;
 }
 
-int lov_lock_init(const struct lu_env *env, struct cl_object *obj,
+static int lov_lock_init(const struct lu_env *env, struct cl_object *obj,
                  struct cl_lock *lock, const struct cl_io *io)
 {
        /* No need to lock because we've taken one refcount of layout.  */
@@ -1677,10 +1678,10 @@ out:
        return result;
 }
 
-int fiemap_for_stripe(const struct lu_env *env, struct cl_object *obj,
-                     struct lov_stripe_md *lsm, struct fiemap *fiemap,
-                     size_t *buflen, struct ll_fiemap_info_key *fmkey,
-                     int index, int stripeno, struct fiemap_state *fs)
+static int fiemap_for_stripe(const struct lu_env *env, struct cl_object *obj,
+                            struct lov_stripe_md *lsm, struct fiemap *fiemap,
+                            size_t *buflen, struct ll_fiemap_info_key *fmkey,
+                            int index, int stripeno, struct fiemap_state *fs)
 {
        struct lov_stripe_md_entry *lsme = lsm->lsm_entries[index];
        struct cl_object *subobj;
@@ -2116,12 +2117,12 @@ static const struct cl_object_operations lov_ops = {
 };
 
 static const struct lu_object_operations lov_lu_obj_ops = {
-        .loo_object_init      = lov_object_init,
-        .loo_object_delete    = lov_object_delete,
-        .loo_object_release   = NULL,
-        .loo_object_free      = lov_object_free,
-        .loo_object_print     = lov_object_print,
-        .loo_object_invariant = NULL
+       .loo_object_init        = lov_object_init,
+       .loo_object_delete      = lov_object_delete,
+       .loo_object_release     = NULL,
+       .loo_object_free        = lov_object_free,
+       .loo_object_print       = lov_object_print,
+       .loo_object_invariant   = NULL,
 };
 
 struct lu_object *lov_object_alloc(const struct lu_env *env,
@@ -2149,7 +2150,7 @@ struct lu_object *lov_object_alloc(const struct lu_env *env,
        RETURN(obj);
 }
 
-struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov)
+static struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov)
 {
        struct lov_stripe_md *lsm = NULL;
 

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index 0dec8de..9f200ad 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -48,13 +48,12 @@
  *
  */
 
-int lovsub_object_init(const struct lu_env *env, struct lu_object *obj,
-                      const struct lu_object_conf *conf)
+static int lovsub_object_init(const struct lu_env *env, struct lu_object *obj,
+                             const struct lu_object_conf *conf)
 {
        struct lovsub_device *dev = lu2lovsub_dev(obj->lo_dev);
        struct lu_object *below;
        struct lu_device *under;
-
        int result;
 
        ENTRY;