X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_ost.h;h=5a9961d7bbc761f96570747a54e234fc8030e7d4;hb=2adc20013d9c2a5969a3154b0ca93ac007b1a4e2;hp=528992d52668617dea8778eacd9990678d784fbe;hpb=2475a817f8e3ba77fb1808a47c0b5c732278cdf8;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index 528992d..5a9961d 100644
--- a/lustre/include/obd_ost.h
+++ b/lustre/include/obd_ost.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,7 +36,7 @@
  * lustre/include/obd_ost.h
  *
  * Data structures for object storage targets and client: OST & OSC's
- * 
+ *
  * See also lustre_idl.h for wire formats of requests.
  */
 
@@ -53,41 +53,46 @@ struct osc_brw_async_args {
         int                aa_resends;
         struct brw_page  **aa_ppga;
         struct client_obd *aa_cli;
-        struct list_head   aa_oaps;
+        cfs_list_t         aa_oaps;
+	cfs_list_t         aa_exts;
+        struct obd_capa   *aa_ocapa;
+        struct cl_req     *aa_clerq;
 };
 
+#define osc_grant_args osc_brw_async_args
 struct osc_async_args {
         struct obd_info   *aa_oi;
 };
 
+struct osc_setattr_args {
+        struct obdo         *sa_oa;
+        obd_enqueue_update_f sa_upcall;
+        void                *sa_cookie;
+};
+
+struct osc_fsync_args {
+	struct obd_info     *fa_oi;
+	obd_enqueue_update_f fa_upcall;
+	void                *fa_cookie;
+};
+
 struct osc_enqueue_args {
-        struct obd_export       *oa_exp;
-        struct obd_info         *oa_oi;
-        struct ldlm_enqueue_info*oa_ei;
+        struct obd_export        *oa_exp;
+	__u64                    *oa_flags;
+        obd_enqueue_update_f      oa_upcall;
+        void                     *oa_cookie;
+        struct ost_lvb           *oa_lvb;
+        struct lustre_handle     *oa_lockh;
+        struct ldlm_enqueue_info *oa_ei;
+        unsigned int              oa_agl:1;
 };
 
+#if 0
 int osc_extent_blocking_cb(struct ldlm_lock *lock,
                            struct ldlm_lock_desc *new, void *data,
                            int flag);
+#endif
 
-/** 
- * 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;
-}
+#define POSTID LPU64":"LPX64
 
 #endif