- remove more forgotten relics

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index d9255ba..b3f5d8c 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -202,7 +202,7 @@ struct client_obd {
 
         /* keep track of objects that have lois that contain pages which
          * have been queued for async brw.  this lock also protects the
-         * lists of obd_client_pages that hang off of the loi */
+         * lists of osc_client_pages that hang off of the loi */
         spinlock_t               cl_loi_list_lock;
         struct list_head         cl_loi_ready_list;
         int                      cl_brw_in_flight;

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 8ba561a..c9dd7ba 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -1035,10 +1035,6 @@ static inline int obd_register_observer(struct obd_device *obd,
 extern int obd_init_caches(void);
 extern void obd_cleanup_caches(void);
 
-/* async page pushing io helpers */
-struct obd_client_page *ocp_alloc(struct page *page);
-void ocp_free(struct page *page);
-
 /* support routines */
 extern kmem_cache_t *obdo_cachep;
 static inline struct obdo *obdo_alloc(void)

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 9818c43..49df609 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -152,9 +152,6 @@ void ll_ap_completion_24(void *data, int cmd, int rc);
 #define ll_ap_completion ll_ap_completion_26
 void ll_ap_completion_26(void *data, int cmd, int rc);
 #endif
-int ll_ocp_update_obdo(struct obd_client_page *ocp, int cmd, struct obdo *oa);
-int ll_ocp_set_io_ready(struct obd_client_page *ocp, int cmd);
-int ll_ocp_update_io_args(struct obd_client_page *ocp, int cmd);
 void ll_removepage(struct page *page);
 int ll_sync_page(struct page *page);
 int ll_readpage(struct file *file, struct page *page);