LU-6078 utils: fix copytool file bounds checking

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

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index 3c35585..3d6fa6d 100644 (file)
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -6,13 +6,13 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 only,
  * as published by the Free Software Foundation.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License version 2 for more details.  A copy is
  * included in the COPYING file that accompanied this code.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -23,7 +23,7 @@
  * Copyright  2009 Sun Microsystems, Inc. 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/
@@ -224,8 +224,8 @@ struct lod_dir_stripe_info {
        __u32   ldsi_def_hash_type;
        __u32   ldsi_hash_type;
 
-       unsigned int ldsi_striping_cached:1,
-                    ldsi_def_striping_set:1,
+       unsigned int ldsi_def_striping_set:1,
+                    ldsi_def_striping_cached:1,
                     ldsi_striped:1;
 };
 
@@ -251,6 +251,7 @@ struct lod_object {
        unsigned int       ldo_stripes_allocated:16,
                           ldo_striping_cached:1,
                           ldo_def_striping_set:1,
+                          ldo_def_striping_cached:1,
        /* ldo_dir_slave_stripe indicate this is a slave stripe of
         * a striped dir */
                           ldo_dir_slave_stripe:1;
@@ -264,9 +265,9 @@ struct lod_object {
 #define ldo_dir_def_stripenr   ldo_dir_stripe->ldsi_def_stripenr
 #define ldo_dir_hash_type      ldo_dir_stripe->ldsi_hash_type
 #define ldo_dir_def_hash_type  ldo_dir_stripe->ldsi_def_hash_type
-#define ldo_dir_striping_cached        ldo_dir_stripe->ldsi_striping_cached
 #define ldo_dir_striped                ldo_dir_stripe->ldsi_striped
 #define ldo_dir_def_striping_set       ldo_dir_stripe->ldsi_def_striping_set
+#define ldo_dir_def_striping_cached    ldo_dir_stripe->ldsi_def_striping_cached
 #define ldo_dir_def_stripe_offset      ldo_dir_stripe->ldsi_def_stripe_offset
 
 struct lod_it {
@@ -386,6 +387,7 @@ lod_name_get(const struct lu_env *env, const void *area, int len)
                cfs_foreach_bit((__dev)->lod_ost_bitmap, (index))
 
 /* lod_dev.c */
+extern struct kmem_cache *lod_object_kmem;
 int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
                   const struct lu_fid *fid, __u32 *tgt, int *flags);
 /* lod_lov.c */
@@ -467,6 +469,8 @@ int lod_procfs_init(struct lod_device *lod);
 void lod_procfs_fini(struct lod_device *lod);
 
 /* lod_object.c */
+extern struct dt_object_operations lod_obj_ops;
+extern struct lu_object_operations lod_lu_obj_ops;
 int lod_load_lmv_shards(const struct lu_env *env, struct lod_object *lo,
                        struct lu_buf *buf, bool resize);
 int lod_object_set_pool(struct lod_object *o, char *pool);