LU-4423 lustre: don't declare extern variables in C files.

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index b1bec9e..c860762 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -104,6 +104,8 @@
 #endif
 
 extern struct dt_body_operations osd_body_scrub_ops;
+extern struct dt_body_operations osd_body_ops;
+extern struct kmem_cache *osd_object_kmem;
 
 /**
  * Iterator's in-memory data structure for quota file.
@@ -119,6 +121,13 @@ struct osd_it_quota {
        unsigned                 oiq_reset:1; /* 1 -- no need to advance */
 };
 
+enum osd_zap_pos {
+       OZI_POS_INIT = 0,
+       OZI_POS_DOT = 1,        /* cursor at . */
+       OZI_POS_DOTDOT = 2,     /* cursor at .. */
+       OZI_POS_REAL = 3,       /* cursor at real entries */
+};
+
 /**
  * Iterator's in-memory data structure for ZAPs
  *
@@ -130,12 +139,8 @@ struct osd_zap_it {
        zap_cursor_t            *ozi_zc;
        struct osd_object       *ozi_obj;
        unsigned                 ozi_reset:1;   /* 1 -- no need to advance */
-       /* ozi_pos - position of the cursor:
-        * 0 - before any record
-        * 1 - "."
-        * 2 - ".."
-        * 3 - real records */
-       unsigned                 ozi_pos:3;
+       /* ozi_pos - position of the cursor */
+       enum osd_zap_pos        ozi_pos;
        union {
                char             ozi_name[MAXNAMELEN]; /* file name for dir */
                __u64            ozi_key; /* binary key for index files */
@@ -229,10 +234,6 @@ struct osd_thread_info {
        const struct lu_env     *oti_env;
 
        struct lu_fid            oti_fid;
-       /*
-        * XXX temporary: for ->i_op calls.
-        */
-       struct timespec          oti_time;
 
        struct ost_id            oti_ostid;
 
@@ -344,14 +345,15 @@ struct osd_device {
                                 od_xattr_in_sa:1,
                                 od_is_ost:1,
                                 od_in_init:1,
-                                od_posix_acl:1;
+                                od_posix_acl:1,
+                                od_nonrotational:1;
        unsigned int             od_dnsize;
        int                      od_index_backup_stop;
 
        enum lustre_index_backup_policy od_index_backup_policy;
        char                     od_mntdev[128];
        char                     od_svname[128];
-       char                     od_uuid[16];
+       uuid_t                   od_uuid;
 
        int                      od_connects;
        int                      od_index;
@@ -465,7 +467,8 @@ struct osd_object {
        struct lu_object_header *oo_header;
 };
 
-int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *);
+int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *,
+              struct obd_statfs_info *);
 extern const struct dt_index_operations osd_acct_index_ops;
 extern struct lu_device_operations  osd_lu_ops;
 extern struct dt_index_operations osd_dir_ops;
@@ -811,11 +814,11 @@ static inline uint32_t attrs_zfs2fs(const uint64_t flags)
 #endif
 
 #ifndef HAVE_DSL_POOL_CONFIG
-static inline void dsl_pool_config_enter(dsl_pool_t *dp, char *name)
+static inline void dsl_pool_config_enter(dsl_pool_t *dp, void *name)
 {
 }
 
-static inline void dsl_pool_config_exit(dsl_pool_t *dp, char *name)
+static inline void dsl_pool_config_exit(dsl_pool_t *dp, void *name)
 {
 }
 #endif
@@ -951,7 +954,6 @@ static inline void osd_dnode_rele(dnode_t *dn)
        LASSERT(dn->dn_bonus);
        db = dn->dn_bonus;
 
-       DB_DNODE_EXIT(db);
        dmu_buf_rele(&db->db, osd_obj_tag);
 }