b=24037 Remove iopen patch.

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

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index 05bd9c6..81b5f44 100644 (file)
--- a/lustre/include/obd_ost.h
+++ b/lustre/include/obd_ost.h
@@ -26,7 +26,7 @@
  * 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.
  */
 /*
@@ -63,10 +63,10 @@ struct osc_async_args {
         struct obd_info   *aa_oi;
 };
 
-struct osc_punch_args {
-        struct obdo         *pa_oa;
-        obd_enqueue_update_f pa_upcall;
-        void                *pa_cookie;
+struct osc_setattr_args {
+        struct obdo         *sa_oa;
+        obd_enqueue_update_f sa_upcall;
+        void                *sa_cookie;
 };
 
 struct osc_enqueue_args {
@@ -85,6 +85,7 @@ 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.
  */