LU-9679 osc: discard oe_intree

[fs/lustre-release.git] / lustre / include / lustre_osc.h

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 902a82f..4c243ed 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -73,7 +73,6 @@ enum async_flags {
 struct osc_async_page {
        int                     oap_magic;
        unsigned short          oap_cmd;
-       unsigned short          oap_interrupted:1;
 
        struct list_head        oap_pending_item;
        struct list_head        oap_rpc_item;
@@ -342,19 +341,8 @@ static inline void osc_object_unlock(struct osc_object *obj)
        spin_unlock(&obj->oo_lock);
 }
 
-static inline int osc_object_is_locked(struct osc_object *obj)
-{
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-       return spin_is_locked(&obj->oo_lock);
-#else
-       /*
-        * It is not perfect to return true all the time.
-        * But since this function is only used for assertion
-        * and checking, it seems OK.
-        */
-       return 1;
-#endif
-}
+#define assert_osc_object_is_locked(obj)       \
+       assert_spin_locked(&obj->oo_lock)
 
 static inline void osc_object_set_contended(struct osc_object *obj)
 {
@@ -586,7 +574,6 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
                    long target, bool force);
 
 /* osc_cache.c */
-int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops);
 int osc_set_async_flags(struct osc_object *obj, struct osc_page *opg,
                        u32 async_flags);
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
@@ -627,13 +614,13 @@ static inline void osc_io_unplug(const struct lu_env *env,
        (void)osc_io_unplug0(env, cli, osc, 0);
 }
 
-typedef int (*osc_page_gang_cbt)(const struct lu_env *, struct cl_io *,
-                                struct osc_page *, void *);
-int osc_page_gang_lookup(const struct lu_env *env, struct cl_io *io,
-                       struct osc_object *osc, pgoff_t start, pgoff_t end,
-                       osc_page_gang_cbt cb, void *cbdata);
-int osc_discard_cb(const struct lu_env *env, struct cl_io *io,
-                  struct osc_page *ops, void *cbdata);
+typedef bool (*osc_page_gang_cbt)(const struct lu_env *, struct cl_io *,
+                                 struct osc_page *, void *);
+bool osc_page_gang_lookup(const struct lu_env *env, struct cl_io *io,
+                         struct osc_object *osc, pgoff_t start, pgoff_t end,
+                         osc_page_gang_cbt cb, void *cbdata);
+bool osc_discard_cb(const struct lu_env *env, struct cl_io *io,
+                   struct osc_page *ops, void *cbdata);
 
 /* osc_dev.c */
 int osc_device_init(const struct lu_env *env, struct lu_device *d,
@@ -778,9 +765,9 @@ static inline struct cl_object *osc2cl(const struct osc_object *obj)
        return (struct cl_object *)&obj->oo_cl;
 }
 
-static inline struct osc_device *obd2osc_dev(const struct obd_device *d)
+static inline struct osc_device *obd2osc_dev(const struct obd_device *obd)
 {
-       return container_of0(d->obd_lu_dev, struct osc_device,
+       return container_of0(obd->obd_lu_dev, struct osc_device,
                             od_cl.cd_lu_dev);
 }
 
@@ -913,9 +900,8 @@ struct osc_extent {
        /** state of this extent */
        enum osc_extent_state   oe_state;
        /** flags for this extent. */
-       unsigned int            oe_intree:1,
        /** 0 is write, 1 is read */
-                               oe_rw:1,
+       unsigned int            oe_rw:1,
        /** sync extent, queued by osc_queue_sync_pages() */
                                oe_sync:1,
        /** set if this extent has partial, sync pages.