LU-6048 kernel: kernel update [RHEL7 3.10.0-123.13.2.el7]

[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 83b3658..18bc755 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/
@@ -139,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;
 
        /**
@@ -622,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 */