LU-11765 ofd: return EAGAIN during 1st CLEANUP_ORPHAN

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

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index df5b714..afc210b 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -106,7 +106,8 @@ struct ofd_seq {
        struct mutex            os_create_lock;
        atomic_t                os_refc;
        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 {
@@ -142,7 +143,7 @@ struct ofd_device {
        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 +160,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)
@@ -426,9 +431,9 @@ extern struct ldlm_valblock_ops ofd_lvbo;
 /* ofd_dlm.c */
 extern struct kmem_cache *ldlm_glimpse_work_kmem;
 
-int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
-                     void *req_cookie, enum ldlm_mode mode, __u64 flags,
-                     void *data);
+int ofd_intent_policy(const struct lu_env *env, struct ldlm_namespace *ns,
+                     struct ldlm_lock **lockp, void *req_cookie,
+                     enum ldlm_mode mode, __u64 flags, void *data);
 
 static inline struct ofd_thread_info *ofd_info(const struct lu_env *env)
 {
@@ -485,7 +490,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;