X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_ost.h;h=761d780ad38fd4aaa3971775d517c3c2297a7e0e;hb=fa32b478599bbdfe6d51e41d8715665632d011b3;hp=05bd9c6665414f67b2d532da7365629a65536db0;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index 05bd9c6..761d780 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.
@@ -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, Whamcloud, Inc.
  */
 /*
  * 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;
 };
@@ -63,10 +64,16 @@ 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_fsync_args {
+	struct obd_info     *fa_oi;
+	obd_enqueue_update_f fa_upcall;
+	void                *fa_cookie;
 };
 
 struct osc_enqueue_args {
@@ -77,6 +84,7 @@ struct osc_enqueue_args {
         struct ost_lvb           *oa_lvb;
         struct lustre_handle     *oa_lockh;
         struct ldlm_enqueue_info *oa_ei;
+        unsigned int              oa_agl:1;
 };
 
 #if 0
@@ -85,6 +93,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.
  */