LU-2675 mdd: remove dead code

Remove the declarations of several undefined mdd functions. Remove
several unused functions. Remove the file mdd_lov.c.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Ife0d13ee414bd43c42389d9e58d9dd97344cb33c
Reviewed-on: http://review.whamcloud.com/8548
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/mdd/Makefile.in b/lustre/mdd/Makefile.in
index fd3e7e5..6d9ef35 100644 (file)
--- a/lustre/mdd/Makefile.in
+++ b/lustre/mdd/Makefile.in
@@ -1,6 +1,11 @@
 MODULES := mdd
 MODULES := mdd

-mdd-objs := mdd_object.o mdd_lov.o mdd_orphans.o mdd_lproc.o mdd_dir.o
-mdd-objs += mdd_device.o mdd_trans.o mdd_permission.o mdd_lock.o
-mdd-objs += mdd_compat.o
-
+mdd-objs := mdd_compat.o \
+       mdd_device.o \
+       mdd_dir.o \
+       mdd_lock.o \
+       mdd_lproc.o \
+       mdd_object.o \
+       mdd_orphans.o \
+       mdd_permission.o \
+       mdd_trans.o

 @INCLUDE_RULES@
 @INCLUDE_RULES@

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 0fe590e..379874e 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -52,7 +52,7 @@
 
 #include "mdd_internal.h"
 
 
 #include "mdd_internal.h"
 

-const struct md_device_operations mdd_ops;
+static const struct md_device_operations mdd_ops;

 static struct lu_device_type mdd_device_type;
 
 static const char mdd_root_dir_name[] = "ROOT";
 static struct lu_device_type mdd_device_type;
 
 static const char mdd_root_dir_name[] = "ROOT";


@@ -260,7 +260,8 @@ static int llog_changelog_cancel(const struct lu_env *env,
 
 static struct llog_operations changelog_orig_logops;
 
 
 static struct llog_operations changelog_orig_logops;
 

-int mdd_changelog_on(const struct lu_env *env, struct mdd_device *mdd, int on);
+static int
+mdd_changelog_on(const struct lu_env *env, struct mdd_device *mdd, int on);

 
 static int mdd_changelog_llog_init(const struct lu_env *env,
                                   struct mdd_device *mdd)
 
 static int mdd_changelog_llog_init(const struct lu_env *env,
                                   struct mdd_device *mdd)


@@ -404,11 +405,13 @@ static void mdd_changelog_fini(const struct lu_env *env,
        }
 }
 
        }
 }
 

-int mdd_changelog_write_header(const struct lu_env *env,
-                              struct mdd_device *mdd, int markerflags);
+static int
+mdd_changelog_write_header(const struct lu_env *env, struct mdd_device *mdd,
+                          int markerflags);

 
 /* Start / stop recording */
 
 /* Start / stop recording */

-int mdd_changelog_on(const struct lu_env *env, struct mdd_device *mdd, int on)
+static int
+mdd_changelog_on(const struct lu_env *env, struct mdd_device *mdd, int on)

 {
         int rc = 0;
 
 {
         int rc = 0;
 


@@ -441,8 +444,9 @@ int mdd_changelog_on(const struct lu_env *env, struct mdd_device *mdd, int on)
  * \param endrec
  * \retval 0 ok
  */
  * \param endrec
  * \retval 0 ok
  */

-int mdd_changelog_llog_cancel(const struct lu_env *env,
-                             struct mdd_device *mdd, long long endrec)
+static int
+mdd_changelog_llog_cancel(const struct lu_env *env, struct mdd_device *mdd,
+                         long long endrec)

 {
         struct obd_device *obd = mdd2obd_dev(mdd);
         struct llog_ctxt *ctxt;
 {
         struct obd_device *obd = mdd2obd_dev(mdd);
         struct llog_ctxt *ctxt;


@@ -1515,7 +1519,7 @@ static int mdd_iocontrol(const struct lu_env *env, struct md_device *m,
 /* type constructor/destructor: mdd_type_init, mdd_type_fini */
 LU_TYPE_INIT_FINI(mdd, &mdd_thread_key);
 
 /* type constructor/destructor: mdd_type_init, mdd_type_fini */
 LU_TYPE_INIT_FINI(mdd, &mdd_thread_key);
 

-const struct md_device_operations mdd_ops = {
+static const struct md_device_operations mdd_ops = {

        .mdo_statfs         = mdd_statfs,
        .mdo_root_get       = mdd_root_get,
        .mdo_init_capa_ctxt = mdd_init_capa_ctxt,
        .mdo_statfs         = mdd_statfs,
        .mdo_root_get       = mdd_root_get,
        .mdo_init_capa_ctxt = mdd_init_capa_ctxt,

diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c
index a524f27..bce304b 100644 (file)
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -714,9 +714,9 @@ int mdd_changelog_store(const struct lu_env *env, struct mdd_device *mdd,
  *             this will hopefully be fixed in llog rewrite
  * \retval 0 ok
  */
  *             this will hopefully be fixed in llog rewrite
  * \retval 0 ok
  */

-int mdd_changelog_ext_store(const struct lu_env *env, struct mdd_device *mdd,
-                           struct llog_changelog_ext_rec *rec,
-                           struct thandle *th)
+static int
+mdd_changelog_ext_store(const struct lu_env *env, struct mdd_device *mdd,
+                       struct llog_changelog_ext_rec *rec, struct thandle *th)

 {
        struct obd_device       *obd = mdd2obd_dev(mdd);
        struct llog_ctxt        *ctxt;
 {
        struct obd_device       *obd = mdd2obd_dev(mdd);
        struct llog_ctxt        *ctxt;

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index a95a42c..f6657be 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -122,10 +122,6 @@ struct mdd_object {
         __u32             mod_valid;
         __u64             mod_cltime;
         unsigned long     mod_flags;
         __u32             mod_valid;
         __u64             mod_cltime;
         unsigned long     mod_flags;

-#ifdef CONFIG_LOCKDEP
-       /* "dep_map" name is assumed by lockdep.h macros. */
-       struct lockdep_map dep_map;
-#endif

 };
 
 struct mdd_thread_info {
 };
 
 struct mdd_thread_info {


@@ -142,79 +138,23 @@ struct mdd_thread_info {
        struct lu_attr            mti_la_for_fix;
        /* Only used in mdd_object_start */
        struct lu_attr            mti_la_for_start;
        struct lu_attr            mti_la_for_fix;
        /* Only used in mdd_object_start */
        struct lu_attr            mti_la_for_start;

-       struct md_attr            mti_ma;
-       struct obd_info           mti_oi;

        /* mti_ent and mti_key must be conjoint,
        * then mti_ent::lde_name will be mti_key. */
        struct lu_dirent          mti_ent;
        char                      mti_key[NAME_MAX + 16];
        /* mti_ent and mti_key must be conjoint,
        * then mti_ent::lde_name will be mti_key. */
        struct lu_dirent          mti_ent;
        char                      mti_key[NAME_MAX + 16];

-       struct obd_trans_info     mti_oti;

        struct lu_buf             mti_buf[4];
        struct lu_buf             mti_big_buf; /* biggish persistent buf */
        struct lu_buf             mti_link_buf; /* buf for link ea */
        struct lu_buf             mti_buf[4];
        struct lu_buf             mti_big_buf; /* biggish persistent buf */
        struct lu_buf             mti_link_buf; /* buf for link ea */

-       struct lu_name            mti_name;
-       struct lu_name            mti_name2;

        struct obdo               mti_oa;
        char                      mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE];
        struct dt_allocation_hint mti_hint;
        struct obdo               mti_oa;
        char                      mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE];
        struct dt_allocation_hint mti_hint;

-       struct lov_mds_md        *mti_max_lmm;
-       int                       mti_max_lmm_size;
-       struct llog_cookie       *mti_max_cookie;
-       int                       mti_max_cookie_size;

        struct dt_object_format   mti_dof;
        struct dt_object_format   mti_dof;

-       struct obd_quotactl       mti_oqctl;

        struct linkea_data        mti_link_data;
        struct md_op_spec         mti_spec;
 };
 
 extern const char orph_index_name[];
 
        struct linkea_data        mti_link_data;
        struct md_op_spec         mti_spec;
 };
 
 extern const char orph_index_name[];
 

-extern const struct dt_index_features orph_index_features;
-
-struct lov_mds_md *mdd_max_lmm_buffer(const struct lu_env *env, int size);
-struct lov_mds_md *mdd_max_lmm_get(const struct lu_env *env,
-                                   struct mdd_device *mdd);
-
-struct llog_cookie *mdd_max_cookie_get(const struct lu_env *env,
-                                       struct mdd_device *mdd);
-
-int mdd_init_obd(const struct lu_env *env, struct mdd_device *mdd,
-                 struct lustre_cfg *cfg);
-int mdd_fini_obd(const struct lu_env *env, struct mdd_device *mdd,
-                 struct lustre_cfg *lcfg);
-int __mdd_xattr_set(const struct lu_env *env, struct mdd_object *obj,
-                    const struct lu_buf *buf, const char *name,
-                    int fl, struct thandle *handle);
-int mdd_xattr_set_txn(const struct lu_env *env, struct mdd_object *obj,
-                      const struct lu_buf *buf, const char *name, int fl,
-                      struct thandle *txn);
-int mdd_lsm_sanity_check(const struct lu_env *env, struct mdd_object *obj);
-int mdd_lov_set_md(const struct lu_env *env, struct mdd_object *pobj,
-                   struct mdd_object *child, struct lov_mds_md *lmm,
-                   int lmm_size, struct thandle *handle, int set_stripe);
-int mdd_lov_create(const struct lu_env *env, struct mdd_device *mdd,
-                   struct mdd_object *parent, struct mdd_object *child,
-                   struct lov_mds_md **lmm, int *lmm_size,
-                   const struct md_op_spec *spec, struct md_attr *ma);
-int mdd_lov_objid_prepare(struct mdd_device *mdd, struct lov_mds_md *lmm);
-int mdd_declare_lov_objid_update(const struct lu_env *, struct mdd_device *,
-                                 struct thandle *);
-void mdd_lov_objid_update(struct mdd_device *mdd, struct lov_mds_md *lmm);
-void mdd_lov_create_finish(const struct lu_env *env, struct mdd_device *mdd,
-                           struct lov_mds_md *lmm, int lmm_size,
-                           const struct md_op_spec *spec);
-int mdd_file_lock(const struct lu_env *env, struct md_object *obj,
-                  struct lov_mds_md *lmm, struct ldlm_extent *extent,
-                  struct lustre_handle *lockh);
-int mdd_file_unlock(const struct lu_env *env, struct md_object *obj,
-                    struct lov_mds_md *lmm, struct lustre_handle *lockh);
-int mdd_lum_lmm_cmp(const struct lu_env *env, struct md_object *cobj,
-                    const struct md_op_spec *spec, struct md_attr *ma);
-int mdd_get_md(const struct lu_env *env, struct mdd_object *obj,
-               void *md, int *md_size, const char *name);
-int mdd_get_md_locked(const struct lu_env *env, struct mdd_object *obj,
-                      void *md, int *md_size, const char *name);
-int mdd_data_get(const struct lu_env *env, struct mdd_object *obj, void **data);

 int mdd_la_get(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *la, struct lustre_capa *capa);
 void mdd_flags_xlate(struct mdd_object *obj, __u32 flags);
 int mdd_la_get(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *la, struct lustre_capa *capa);
 void mdd_flags_xlate(struct mdd_object *obj, __u32 flags);


@@ -230,19 +170,11 @@ int mdd_attr_set_internal(const struct lu_env *env,
 int mdd_update_time(const struct lu_env *env, struct mdd_object *obj,
                    const struct lu_attr *oattr, struct lu_attr *attr,
                    struct thandle *handle);
 int mdd_update_time(const struct lu_env *env, struct mdd_object *obj,
                    const struct lu_attr *oattr, struct lu_attr *attr,
                    struct thandle *handle);

-int mdd_declare_object_kill(const struct lu_env *env, struct mdd_object *obj,
-                            struct md_attr *ma, struct thandle *handle);
-int mdd_object_kill(const struct lu_env *env, struct mdd_object *obj,
-                    struct md_attr *ma, struct thandle *handle);
-int mdd_iattr_get(const struct lu_env *env, struct mdd_object *mdd_obj,
-                  struct md_attr *ma);

 int mdd_object_create_internal(const struct lu_env *env, struct mdd_object *p,
                               struct mdd_object *c, struct lu_attr *attr,
                               struct thandle *handle,
                               const struct md_op_spec *spec,
                               struct dt_allocation_hint *hint);
 int mdd_object_create_internal(const struct lu_env *env, struct mdd_object *p,
                               struct mdd_object *c, struct lu_attr *attr,
                               struct thandle *handle,
                               const struct md_op_spec *spec,
                               struct dt_allocation_hint *hint);

-int mdd_lmm_get_locked(const struct lu_env *env, struct mdd_object *mdd_obj,
-                       struct md_attr *ma);

 
 /* mdd_lock.c */
 void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
 
 /* mdd_lock.c */
 void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,


@@ -253,11 +185,6 @@ void mdd_write_unlock(const struct lu_env *env, struct mdd_object *obj);
 void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj);
 int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj);
 
 void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj);
 int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj);
 

-unsigned long mdd_name2hash(const char *name);
-void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj,
-                         const char *name, enum mdd_object_role role);
-void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
-                          void *dlh);

 /* mdd_dir.c */
 int mdd_is_subdir(const struct lu_env *env, struct md_object *mo,
                   const struct lu_fid *fid, struct lu_fid *sfid);
 /* mdd_dir.c */
 int mdd_is_subdir(const struct lu_env *env, struct md_object *mo,
                   const struct lu_fid *fid, struct lu_fid *sfid);


@@ -299,37 +226,11 @@ int mdd_links_rename(const struct lu_env *env,
                     struct thandle *handle,
                     struct linkea_data *ldata,
                     int first, int check);
                     struct thandle *handle,
                     struct linkea_data *ldata,
                     int first, int check);

-int mdd_declare_links_add(const struct lu_env *env, struct mdd_object *mdd_obj,
-                         struct thandle *handle, struct linkea_data *ldata);
-
-/* mdd_lov.c */
-int mdd_declare_unlink_log(const struct lu_env *env, struct mdd_object *obj,
-                           struct md_attr *ma, struct thandle *handle);
-int mdd_unlink_log(const struct lu_env *env, struct mdd_device *mdd,
-                   struct mdd_object *mdd_cobj, struct md_attr *ma);
-
-int mdd_setattr_log(const struct lu_env *env, struct mdd_device *mdd,
-                    const struct md_attr *ma,
-                    struct lov_mds_md *lmm, int lmm_size,
-                    struct llog_cookie *logcookies, int cookies_size);
-
-int mdd_get_cookie_size(const struct lu_env *env, struct mdd_device *mdd,
-                        struct lov_mds_md *lmm);
-
-int mdd_lov_setattr_async(const struct lu_env *env, struct mdd_object *obj,
-                          struct lov_mds_md *lmm, int lmm_size,
-                          struct llog_cookie *logcookies);
-
-int mdd_lovobj_unlink(const struct lu_env *env, struct mdd_device *mdd,
-                     struct mdd_object *obj, struct lu_attr *la,
-                     struct md_attr *ma, int log_unlink);

 
 struct mdd_thread_info *mdd_env_info(const struct lu_env *env);
 
 #define MDD_ENV_VAR(env, var) (&mdd_env_info(env)->mti_##var)
 
 
 struct mdd_thread_info *mdd_env_info(const struct lu_env *env);
 
 #define MDD_ENV_VAR(env, var) (&mdd_env_info(env)->mti_##var)
 

-const struct lu_name *mdd_name_get_const(const struct lu_env *env,
-                                        const void *area, ssize_t len);

 struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len);
 const struct lu_buf *mdd_buf_get_const(const struct lu_env *env,
                                        const void *area, ssize_t len);
 struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len);
 const struct lu_buf *mdd_buf_get_const(const struct lu_env *env,
                                        const void *area, ssize_t len);


@@ -352,12 +253,7 @@ int mdd_procfs_init(struct mdd_device *mdd, const char *name);
 int mdd_procfs_fini(struct mdd_device *mdd);
 
 /* mdd_object.c */
 int mdd_procfs_fini(struct mdd_device *mdd);
 
 /* mdd_object.c */

-struct lu_buf *mdd_buf_alloc(const struct lu_env *env, ssize_t len);
-int mdd_buf_grow(const struct lu_env *env, ssize_t len);
-void mdd_buf_put(struct lu_buf *buf);
-
-struct lu_buf *mdd_link_buf_alloc(const struct lu_env *env, ssize_t len);
-int mdd_link_buf_grow(const struct lu_env *env, ssize_t len);
+extern struct kmem_cache *mdd_object_kmem;

 extern const struct md_dir_operations    mdd_dir_ops;
 extern const struct md_object_operations mdd_obj_ops;
 int mdd_readlink(const struct lu_env *env, struct md_object *obj,
 extern const struct md_dir_operations    mdd_dir_ops;
 extern const struct md_object_operations mdd_obj_ops;
 int mdd_readlink(const struct lu_env *env, struct md_object *obj,


@@ -369,7 +265,6 @@ extern const struct lu_device_operations mdd_lu_ops;
 struct mdd_object *mdd_object_find(const struct lu_env *env,
                                    struct mdd_device *d,
                                    const struct lu_fid *f);
 struct mdd_object *mdd_object_find(const struct lu_env *env,
                                    struct mdd_device *d,
                                    const struct lu_fid *f);

-int mdd_get_default_md(struct mdd_object *mdd_obj, struct lov_mds_md *lmm);

 int mdd_readpage(const struct lu_env *env, struct md_object *obj,
                  const struct lu_rdpg *rdpg);
 int mdd_declare_changelog_store(const struct lu_env *env,
 int mdd_readpage(const struct lu_env *env, struct md_object *obj,
                  const struct lu_rdpg *rdpg);
 int mdd_declare_changelog_store(const struct lu_env *env,


@@ -397,9 +292,6 @@ int mdd_get_lov_ea(const struct lu_env *env, struct mdd_object *obj,
                   struct lu_buf *lmm_buf);
 
 /* mdd_trans.c */
                   struct lu_buf *lmm_buf);
 
 /* mdd_trans.c */

-int mdd_lov_destroy(const struct lu_env *env, struct mdd_device *mdd,
-                    struct mdd_object *obj, struct lu_attr *la);
-

 void mdd_object_make_hint(const struct lu_env *env, struct mdd_object *parent,
                          struct mdd_object *child, const struct lu_attr *attr,
                          const struct md_op_spec *spec,
 void mdd_object_make_hint(const struct lu_env *env, struct mdd_object *parent,
                          struct mdd_object *child, const struct lu_attr *attr,
                          const struct md_op_spec *spec,


@@ -422,10 +314,6 @@ int mdd_trans_start(const struct lu_env *env, struct mdd_device *mdd,
                     struct thandle *th);
 int mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd,
                   int rc, struct thandle *handle);
                     struct thandle *th);
 int mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd,
                   int rc, struct thandle *handle);

-int mdd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
-                    void *cookie);
-int mdd_txn_start_cb(const struct lu_env *env, struct thandle *,
-                     void *cookie);

 
 /* mdd_device.c */
 struct lu_object *mdd_object_alloc(const struct lu_env *env,
 
 /* mdd_device.c */
 struct lu_object *mdd_object_alloc(const struct lu_env *env,


@@ -437,8 +325,6 @@ int mdd_local_file_create(const struct lu_env *env, struct mdd_device *mdd,
 
 int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
                   struct thandle *handle);
 
 int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
                   struct thandle *handle);

-int __mdd_declare_acl_init(const struct lu_env *env, struct mdd_object *obj,
-                           int is_dir, struct thandle *handle);

 int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *attr, const struct lu_buf *buf, int fl);
 int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf,
 int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *attr, const struct lu_buf *buf, int fl);
 int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf,


@@ -519,11 +405,6 @@ static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj)
         return lu_object_fid(&obj->mod_obj.mo_lu);
 }
 
         return lu_object_fid(&obj->mod_obj.mo_lu);
 }
 

-static inline int mdd_object_obf(const struct mdd_object *obj)
-{
-       return lu_fid_eq(mdo2fid(obj), &LU_OBF_FID);
-}
-

 static inline umode_t mdd_object_type(const struct mdd_object *obj)
 {
         return lu_object_attr(&obj->mod_obj.mo_lu);
 static inline umode_t mdd_object_type(const struct mdd_object *obj)
 {
         return lu_object_attr(&obj->mod_obj.mo_lu);


@@ -604,10 +485,6 @@ static inline const char *mdd_obj_dev_name(const struct mdd_object *obj)
 
 #define MAX_ATIME_DIFF 60
 
 
 #define MAX_ATIME_DIFF 60
 

-enum {
-        LPROC_MDD_NR
-};
-

 static inline int mdd_permission_internal(const struct lu_env *env,
                                          struct mdd_object *obj,
                                          const struct lu_attr *la, int mask)
 static inline int mdd_permission_internal(const struct lu_env *env,
                                          struct mdd_object *obj,
                                          const struct lu_attr *la, int mask)


@@ -624,15 +501,6 @@ static inline int mdd_permission_internal_locked(const struct lu_env *env,
        return __mdd_permission_internal(env, obj, la, mask, role);
 }
 
        return __mdd_permission_internal(env, obj, la, mask, role);
 }
 

-static inline int mdo_data_get(const struct lu_env *env,
-                               struct mdd_object *obj,
-                               void **data)
-{
-        struct dt_object *next = mdd_object_child(obj);
-        next->do_ops->do_data_get(env, next, data);
-        return 0;
-}
-

 /* mdd inline func for calling osd_dt_object ops */
 static inline int mdo_attr_get(const struct lu_env *env, struct mdd_object *obj,
                                struct lu_attr *la, struct lustre_capa *capa)
 /* mdd inline func for calling osd_dt_object ops */
 static inline int mdo_attr_get(const struct lu_env *env, struct mdd_object *obj,
                                struct lu_attr *la, struct lustre_capa *capa)


@@ -734,14 +602,6 @@ int mdo_xattr_list(const struct lu_env *env, struct mdd_object *obj,
 }
 
 static inline
 }
 
 static inline

-int mdo_index_try(const struct lu_env *env, struct mdd_object *obj,
-                                 const struct dt_index_features *feat)
-{
-        struct dt_object *next = mdd_object_child(obj);
-        return next->do_ops->do_index_try(env, next, feat);
-}
-
-static inline

 int mdo_declare_index_insert(const struct lu_env *env, struct mdd_object *obj,
                              const struct lu_fid *fid, const char *name,
                              struct thandle *handle)
 int mdo_declare_index_insert(const struct lu_env *env, struct mdd_object *obj,
                              const struct lu_fid *fid, const char *name,
                              struct thandle *handle)

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 2d33a16..60bf87d 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -82,8 +82,3 @@ int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
 
         return next->do_ops->do_write_locked(env, next);
 }
 
         return next->do_ops->do_write_locked(env, next);
 }

-
-unsigned long mdd_name2hash(const char *name)
-{
-        return full_name_hash((unsigned char*)name, strlen(name));
-}

diff --git a/lustre/mdd/mdd_lov.c b/lustre/mdd/mdd_lov.c
deleted file mode 100644 (file)
index c2326ea..0000000
--- a/lustre/mdd/mdd_lov.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2012, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * lustre/mdd/mdd_lov.c
- *
- * Lustre Metadata Server (mds) handling of striped file data
- *
- * Author: Peter Braam <braam@clusterfs.com>
- * Author: wangdi <wangdi@clusterfs.com>
- */
-
-#define DEBUG_SUBSYSTEM S_MDS
-
-#include <linux/module.h>
-#include <obd.h>
-#include <obd_class.h>
-#include <lustre_ver.h>
-#include <obd_support.h>
-#include <lprocfs_status.h>
-#include <lustre_mds.h>
-#include <lustre_fid.h>
-#include <lustre/lustre_idl.h>
-
-#include "mdd_internal.h"
-
-int mdd_get_md(const struct lu_env *env, struct mdd_object *obj,
-               void *md, int *md_size, const char *name)
-{
-        int rc;
-        ENTRY;
-
-        rc = mdo_xattr_get(env, obj, mdd_buf_get(env, md, *md_size), name,
-                           mdd_object_capa(env, obj));
-        /*
-         * XXX: Handling of -ENODATA, the right way is to have ->do_md_get()
-         * exported by dt layer.
-         */
-        if (rc == 0 || rc == -ENODATA) {
-                *md_size = 0;
-                rc = 0;
-        } else if (rc < 0) {
-                CDEBUG(D_OTHER, "Error %d reading eadata - %d\n",
-                       rc, *md_size);
-        } else {
-                /* XXX: Convert lov EA but fixed after verification test. */
-                *md_size = rc;
-        }
-
-        RETURN(rc);
-}

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index ec53f2b..d0b9e22 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -57,24 +57,11 @@
 #include "mdd_internal.h"
 
 static const struct lu_object_operations mdd_lu_obj_ops;
 #include "mdd_internal.h"
 
 static const struct lu_object_operations mdd_lu_obj_ops;

-extern struct kmem_cache *mdd_object_kmem;

 
 static int mdd_xattr_get(const struct lu_env *env,
                          struct md_object *obj, struct lu_buf *buf,
                          const char *name);
 
 
 static int mdd_xattr_get(const struct lu_env *env,
                          struct md_object *obj, struct lu_buf *buf,
                          const char *name);
 

-int mdd_data_get(const struct lu_env *env, struct mdd_object *obj,
-                 void **data)
-{
-        if (mdd_object_exists(obj) == 0) {
-                CERROR("%s: object "DFID" not found: rc = -2\n",
-                       mdd_obj_dev_name(obj), PFID(mdd_object_fid(obj)));
-                return -ENOENT;
-        }
-        mdo_data_get(env, obj, data);
-        return 0;
-}
-

 int mdd_la_get(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *la, struct lustre_capa *capa)
 {
 int mdd_la_get(const struct lu_env *env, struct mdd_object *obj,
                struct lu_attr *la, struct lustre_capa *capa)
 {


@@ -108,17 +95,6 @@ struct mdd_thread_info *mdd_env_info(const struct lu_env *env)
         return info;
 }
 
         return info;
 }
 

-const struct lu_name *mdd_name_get_const(const struct lu_env *env,
-                                        const void *area, ssize_t len)
-{
-       struct lu_name *lname;
-
-       lname = &mdd_env_info(env)->mti_name;
-       lname->ln_name = area;
-       lname->ln_namelen = len;
-       return lname;
-}
-

 struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len)
 {
        struct lu_buf *buf;
 struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len)
 {
        struct lu_buf *buf;


@@ -704,8 +680,8 @@ int mdd_changelog_data_store(const struct lu_env *env, struct mdd_device *mdd,
        RETURN(rc);
 }
 
        RETURN(rc);
 }
 

-int mdd_changelog(const struct lu_env *env, enum changelog_rec_type type,
-                  int flags, struct md_object *obj)
+static int mdd_changelog(const struct lu_env *env, enum changelog_rec_type type,
+                        int flags, struct md_object *obj)

 {
         struct thandle *handle;
         struct mdd_object *mdd_obj = md2mdd_obj(obj);
 {
         struct thandle *handle;
         struct mdd_object *mdd_obj = md2mdd_obj(obj);


@@ -1120,8 +1096,8 @@ static int mdd_declare_xattr_del(const struct lu_env *env,
  * The caller should guarantee to update the object ctime
  * after xattr_set if needed.
  */
  * The caller should guarantee to update the object ctime
  * after xattr_set if needed.
  */

-int mdd_xattr_del(const struct lu_env *env, struct md_object *obj,
-                  const char *name)
+static int mdd_xattr_del(const struct lu_env *env, struct md_object *obj,
+                        const char *name)

 {
        struct mdd_object *mdd_obj = md2mdd_obj(obj);
        struct lu_attr *attr = MDD_ENV_VAR(env, cattr);
 {
        struct mdd_object *mdd_obj = md2mdd_obj(obj);
        struct lu_attr *attr = MDD_ENV_VAR(env, cattr);


@@ -1694,25 +1670,6 @@ static int mdd_open(const struct lu_env *env, struct md_object *obj,
        return rc;
 }
 
        return rc;
 }
 

-int mdd_declare_object_kill(const struct lu_env *env, struct mdd_object *obj,
-                            struct md_attr *ma, struct thandle *handle)
-{
-        return mdo_declare_destroy(env, obj, handle);
-}
-
-/* return md_attr back,
- * if it is last unlink then return lov ea + llog cookie*/
-int mdd_object_kill(const struct lu_env *env, struct mdd_object *obj,
-                    struct md_attr *ma, struct thandle *handle)
-{
-       int rc;
-        ENTRY;
-
-       rc = mdo_destroy(env, obj, handle);
-
-        RETURN(rc);
-}
-

 static int mdd_declare_close(const struct lu_env *env,
                              struct mdd_object *obj,
                              struct md_attr *ma,
 static int mdd_declare_close(const struct lu_env *env,
                              struct mdd_object *obj,
                              struct md_attr *ma,

diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c
index 6e6b39f..78d1c36 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -51,7 +51,7 @@
 #include "mdd_internal.h"
 
 const char orph_index_name[] = "PENDING";
 #include "mdd_internal.h"
 
 const char orph_index_name[] = "PENDING";

-const char *dotdot = "..";
+static const char dotdot[] = "..";

 
 enum {
         ORPH_OP_UNLINK,
 
 enum {
         ORPH_OP_UNLINK,