LU-11997 ptlrpc: Properly swab ll_fiemap_info_key

[fs/lustre-release.git] / lustre / ofd / ofd_internal.h

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index a76cb69..c0f17c4 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -51,18 +51,6 @@
 #define OFD_VALID_FLAGS (LA_TYPE | LA_MODE | LA_SIZE | LA_BLOCKS | \
                         LA_BLKSIZE | LA_ATIME | LA_MTIME | LA_CTIME)
 
-/* per-client-per-object persistent state (LRU) */
-struct ofd_mod_data {
-       struct list_head fmd_list;        /* linked to fed_mod_list */
-       struct lu_fid    fmd_fid;         /* FID being written to */
-       __u64            fmd_mactime_xid; /* xid highest {m,a,c}time setattr */
-       time64_t         fmd_expire;      /* time when the fmd should expire */
-       int              fmd_refcount;    /* reference counter - list holds 1 */
-};
-
-#define OFD_FMD_MAX_NUM_DEFAULT 128
-#define OFD_FMD_MAX_AGE_DEFAULT (obd_timeout + 10)
-
 #define OFD_SOFT_SYNC_LIMIT_DEFAULT 16
 
 /* request stats */
@@ -105,8 +93,10 @@ struct ofd_seq {
        spinlock_t              os_last_oid_lock;
        struct mutex            os_create_lock;
        atomic_t                os_refc;
+       atomic_t                os_precreate_in_progress;
        struct dt_object        *os_lastid_obj;
-       unsigned long           os_destroys_in_progress:1;
+       unsigned long           os_destroys_in_progress:1,
+                               os_last_id_synced:1;
 };
 
 struct ofd_device {
@@ -135,14 +125,10 @@ struct ofd_device {
        /* checksum types supported on this node */
        enum cksum_types         ofd_cksum_types_supported;
 
-       /* ofd mod data: ofd_device wide values */
-       int                      ofd_fmd_max_num; /* per ofd ofd_mod_data */
-       time64_t                 ofd_fmd_max_age; /* time to fmd expiry */
-
        spinlock_t               ofd_flags_lock;
        unsigned long            ofd_raid_degraded:1,
                                 /* sync journal on writes */
-                                ofd_syncjournal:1,
+                                ofd_sync_journal:1,
                                 /* Protected by ofd_lastid_rwsem. */
                                 ofd_lastid_rebuilding:1,
                                 ofd_record_fid_accessed:1,
@@ -159,6 +145,10 @@ struct ofd_device {
        struct ptlrpc_thread     ofd_inconsistency_thread;
        struct list_head         ofd_inconsistency_list;
        spinlock_t               ofd_inconsistency_lock;
+       /* Backwards compatibility */
+       struct attribute        *ofd_read_cache_enable;
+       struct attribute        *ofd_read_cache_max_filesize;
+       struct attribute        *ofd_write_cache_enable;
 };
 
 static inline struct ofd_device *ofd_dev(struct lu_device *d)
@@ -398,22 +388,6 @@ struct ofd_object *ofd_object_find_exists(const struct lu_env *env,
        return fo;
 }
 
-/* ofd_fmd.c */
-int ofd_fmd_init(void);
-void ofd_fmd_exit(void);
-struct ofd_mod_data *ofd_fmd_find(struct obd_export *exp,
-                                 const struct lu_fid *fid);
-struct ofd_mod_data *ofd_fmd_get(struct obd_export *exp,
-                                const struct lu_fid *fid);
-void ofd_fmd_put(struct obd_export *exp, struct ofd_mod_data *fmd);
-void ofd_fmd_expire(struct obd_export *exp);
-void ofd_fmd_cleanup(struct obd_export *exp);
-#ifdef DO_FMD_DROP
-void ofd_fmd_drop(struct obd_export *exp, const struct lu_fid *fid);
-#else
-#define ofd_fmd_drop(exp, fid) do {} while (0)
-#endif
-
 /* ofd_dev.c */
 int ofd_fid_set_index(const struct lu_env *env, struct ofd_device *ofd,
                      int index);
@@ -485,7 +459,7 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi)
  * sync on lock cancel if it is not enabled already. */
 static inline void ofd_slc_set(struct ofd_device *ofd)
 {
-       if (ofd->ofd_syncjournal == 1)
+       if (ofd->ofd_sync_journal == 1)
                ofd->ofd_lut.lut_sync_lock_cancel = NEVER_SYNC_ON_CANCEL;
        else if (ofd->ofd_lut.lut_sync_lock_cancel == NEVER_SYNC_ON_CANCEL)
                ofd->ofd_lut.lut_sync_lock_cancel = ALWAYS_SYNC_ON_CANCEL;
@@ -504,4 +478,5 @@ static inline int ofd_validate_seq(struct obd_export *exp, __u64 seq)
 
        return 0;
 }
+
 #endif /* _OFD_INTERNAL_H */