LU-6496 ptlrpc: Fix wrong code indentation in plain_authorize

[fs/lustre-release.git] / lustre / osc / osc_cl_internal.h

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index 6ed4179..cd4962f 100644 (file)
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,7 +50,6 @@
 #include <obd.h>
 /* osc_build_res_name() */
 #include <cl_object.h>
-#include <lclient.h>
 #include "osc_internal.h"
 
 /** \defgroup osc osc
@@ -68,7 +67,7 @@ struct osc_io {
         /** true if this io is lockless. */
         int                oi_lockless;
        /** how many LRU pages are reserved for this IO */
-       int oi_lru_reserved;
+       unsigned long      oi_lru_reserved;
 
        /** active extents, we know how many bytes is going to be written,
         * so having an active extent will prevent it from being fragmented */
@@ -140,10 +139,10 @@ struct osc_object {
          * List of pages in transfer.
          */
        struct list_head        oo_inflight[CRT_NR];
-        /**
-         * Lock, protecting ccc_object::cob_inflight, because a seat-belt is
-         * locked during take-off and landing.
-         */
+       /**
+        * Lock, protecting osc_page::ops_inflight, because a seat-belt is
+        * locked during take-off and landing.
+        */
        spinlock_t              oo_seatbelt;
 
        /**
@@ -429,7 +428,7 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags);
 int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops);
 int osc_set_async_flags(struct osc_object *obj, struct osc_page *opg,
-                       obd_flag async_flags);
+                       u32 async_flags);
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
                        struct page *page, loff_t offset);
 int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
@@ -623,7 +622,7 @@ struct osc_extent {
        /** link list of osc_object's oo_{hp|urgent|locking}_exts. */
        struct list_head        oe_link;
        /** state of this extent */
-       unsigned int            oe_state;
+       enum osc_extent_state   oe_state;
        /** flags for this extent. */
        unsigned int            oe_intree:1,
        /** 0 is write, 1 is read */