X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_ost.h;h=591dc20e21c3bf922a13212a58b2cafc025c8bdb;hb=4b02a71242504c1aa51fa5bca87721031bf670ae;hp=dac91cffe97ac52b2e98475a3822f633e3590803;hpb=0a859380c36ac24871f221b35042f76c56b04438;p=fs%2Flustre-release.git

diff --git a/lustre/include/obd_ost.h b/lustre/include/obd_ost.h
index dac91cf..591dc20 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, 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;
 };
@@ -69,14 +70,21 @@ struct osc_setattr_args {
         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;
-        int                      *oa_flags;
+	__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
@@ -85,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