LU-12400 zfs: zfs mainline 0.8+ with mainline (5.2) kernel

[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 1fa1f76..4e5b480 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -232,10 +232,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;
 
@@ -347,14 +343,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;
@@ -468,7 +465,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;
@@ -814,11 +812,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
@@ -954,7 +952,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);
 }