Branch HEAD

[fs/lustre-release.git] / lustre / include / lu_object.h

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index 9c070e6..cf83ef1 100644 (file)
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -297,10 +297,11 @@ struct lu_device_type_operations {
                                                struct lu_device_type *t,
                                                struct lustre_cfg *lcfg);
         /*
-         * Free device. Dual to ->ldto_device_alloc().
+         * Free device. Dual to ->ldto_device_alloc(). Returns pointer to
+         * the next device in the stack.
          */
-        void (*ldto_device_free)(const struct lu_env *,
-                                 struct lu_device *);
+        struct lu_device *(*ldto_device_free)(const struct lu_env *,
+                                              struct lu_device *);
 
         /*
          * Initialize the devices after allocation
@@ -369,13 +370,13 @@ struct lu_attr {
         __u32          la_flags;  /* object flags */
         __u32          la_nlink;  /* number of persistent references to this
                                    * object */
+        __u32          la_blkbits; /* blk bits of the object*/
         __u32          la_blksize; /* blk size of the object*/
 
         __u32          la_rdev;   /* real device */
         __u64          la_valid;  /* valid bits */
 };
 
-
 /*
  * Layer in the layered object.
  */
@@ -798,6 +799,11 @@ void lu_object_print(const struct lu_env *env, void *cookie,
 int lu_object_invariant(const struct lu_object *o);
 
 /*
+ * Finalize and free devices in the device stack.
+ */
+void lu_stack_fini(const struct lu_env *env, struct lu_device *top);
+
+/*
  * Returns 1 iff object @o exists on the stable storage,
  * returns -1 iff object @o is on remote server.
  */
@@ -835,7 +841,7 @@ static inline __u32 lu_object_attr(const struct lu_object *o)
 
 struct lu_rdpg {
         /* input params, should be filled out by mdt */
-        __u32                   rp_hash;        /* hash */
+        __u64                   rp_hash;        /* hash */
         int                     rp_count;       /* count in bytes       */
         int                     rp_npages;      /* number of pages      */
         struct page           **rp_pages;       /* pointers to pages    */
@@ -846,6 +852,14 @@ enum lu_xattr_flags {
         LU_XATTR_CREATE  = (1 << 1)
 };
 
+/* For lu_context health-checks */
+enum lu_context_state {
+        LCS_INITIALIZED = 1,
+        LCS_ENTERED,
+        LCS_LEFT,
+        LCS_FINALIZED
+};
+
 /*
  * lu_context. Execution context for lu_object methods. Currently associated
  * with thread.
@@ -886,6 +900,7 @@ struct lu_context {
          * detail.
          */
         void                 **lc_value;
+        enum lu_context_state  lc_state;
 };
 
 /*