LU-4047 build: fix 'memory' errors

[fs/lustre-release.git] / lustre / lod / lod_internal.h

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index 719887f..0dd077b 100644 (file)
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -23,7 +23,7 @@
  * Copyright  2009 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -151,13 +151,15 @@ struct lod_object {
        __u16              ldo_stripenr;
        __u16              ldo_layout_gen;
        __u32              ldo_stripe_size;
+       __u32              ldo_pattern;
+       __u16              ldo_released_stripenr;
        char              *ldo_pool;
        struct dt_object **ldo_stripe;
        /* to know how much memory to free, ldo_stripenr can be less */
-       int                ldo_stripes_allocated;
        /* default striping for directory represented by this object
         * is cached in stripenr/stripe_size */
-       int                ldo_striping_cached:1,
+       unsigned int       ldo_stripes_allocated:16,
+                          ldo_striping_cached:1,
                           ldo_def_striping_set:1;
        __u32              ldo_def_stripe_size;
        __u16              ldo_def_stripenr;
@@ -240,12 +242,6 @@ static inline struct dt_object* lod_object_child(struct lod_object *o)
                        struct dt_object, do_lu);
 }
 
-static inline struct dt_object *lu2dt_obj(struct lu_object *o)
-{
-       LASSERT(ergo(o != NULL, lu_device_is_dt(o->lo_dev)));
-       return container_of0(o, struct dt_object, do_lu);
-}
-
 static inline struct dt_object *dt_object_child(struct dt_object *o)
 {
        return container_of0(lu_object_next(&(o)->do_lu),