X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_ost.h;h=e96a1cb9cda20005fe6a37dfb9c743b29b2fff2b;hb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;hp=8ddb96984e9a8f56ccf7f913a8961ed86931cba3;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index 8ddb969..e96a1cb 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/
@@ -53,19 +53,20 @@ 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;
         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_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 {
@@ -76,6 +77,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
@@ -84,6 +86,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.
  */