X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_oi.h;h=697b81b319c91a0fd3dfa979f00f1469bbeb6b1a;hb=698209700faf51c227f9ba16626de5ed70fa97c8;hp=6d5fae342f59259ab34a9c55d69c6ee32f95bfa9;hpb=4c45115bdf2c5145ca3779c38a06e90024f013f0;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_oi.h b/lustre/osd-ldiskfs/osd_oi.h
index 6d5fae3..697b81b 100644
--- a/lustre/osd-ldiskfs/osd_oi.h
+++ b/lustre/osd-ldiskfs/osd_oi.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,10 +53,9 @@
 #include <lu_object.h>
 #include <md_object.h>
 
-#define OSD_OI_FID_NR         (1UL << OSD_OI_FID_OID_BITS)
-#define OSD_OI_FID_NR_MAX     (1UL << OSD_OI_FID_OID_BITS_MAX)
-
-#define OSD_OII_NOGEN (0)
+#define OSD_OI_FID_OID_BITS	6
+#define OSD_OI_FID_NR		(1UL << OSD_OI_FID_OID_BITS)
+#define OSD_OII_NOGEN		(0)
 
 struct lu_fid;
 struct osd_thread_info;
@@ -138,6 +133,8 @@ enum oi_check_flags {
 	OI_KNOWN_ON_OST	= 0x00000002,
 };
 
+extern unsigned int osd_oi_count;
+
 int osd_oi_mod_init(void);
 int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd,
 		bool restored);
@@ -147,7 +144,7 @@ int  osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
 		   enum oi_check_flags flags);
 int  osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
 		   const struct lu_fid *fid, const struct osd_inode_id *id,
-		   handle_t *th, enum oi_check_flags flags);
+		   handle_t *th, enum oi_check_flags flags, bool *exist);
 int  osd_oi_delete(struct osd_thread_info *info,
 		   struct osd_device *osd, const struct lu_fid *fid,
 		   handle_t *th, enum oi_check_flags flags);