LU-1330 obdclass: add obd_target.h

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

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index 17d9c03..591dc20 100644 (file)
--- a/lustre/include/obd_ost.h
+++ b/lustre/include/obd_ost.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -54,6 +54,7 @@ struct osc_brw_async_args {
         struct brw_page  **aa_ppga;
         struct client_obd *aa_cli;
         cfs_list_t         aa_oaps;
+       cfs_list_t         aa_exts;
         struct obd_capa   *aa_ocapa;
         struct cl_req     *aa_clerq;
 };
@@ -77,7 +78,7 @@ struct osc_fsync_args {
 
 struct osc_enqueue_args {
         struct obd_export        *oa_exp;
-        int                      *oa_flags;
+       __u64                    *oa_flags;
         obd_enqueue_update_f      oa_upcall;
         void                     *oa_cookie;
         struct ost_lvb           *oa_lvb;
@@ -92,25 +93,4 @@ int osc_extent_blocking_cb(struct ldlm_lock *lock,
                            int flag);
 #endif
 
-#define POSTID LPU64":"LPU64
-/** 
- * Build DLM resource name from object id & group for osc-ost extent lock.
- */
-static inline struct ldlm_res_id *osc_build_res_name(__u64 id, __u64 gr,
-                                                     struct ldlm_res_id *name)
-{
-        memset(name, 0, sizeof *name);
-        name->name[0] = id;
-        name->name[1] = gr;
-        return name;
-}
-
-/**
- * Return true if the resource is for the object identified by this id & group.
- */
-static inline int osc_res_name_eq(__u64 id, __u64 gr, struct ldlm_res_id *name)
-{
-        return name->name[0] == id && name->name[1] == gr;
-}
-
 #endif