X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_oi.h;h=7e0c377fb480516eb5e56e717196ebb157ebe630;hb=7c99f67d9d39e8a037e830cf08a9df305e6d8da2;hp=fb52db529a3fdbf9aeb018be3969b64c94102c4c;hpb=72057a3af19ee02d9a686bd7e7d074917e381310;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_oi.h b/lustre/osd-ldiskfs/osd_oi.h
index fb52db5..7e0c377 100644
--- a/lustre/osd-ldiskfs/osd_oi.h
+++ b/lustre/osd-ldiskfs/osd_oi.h
@@ -23,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/
@@ -53,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;
@@ -132,8 +131,11 @@ static inline int osd_id_eq_strict(const struct osd_inode_id *id0,
 enum oi_check_flags {
 	OI_CHECK_FLD	= 0x00000001,
 	OI_KNOWN_ON_OST	= 0x00000002,
+	OI_LOCKED	= 0x00000004,
 };
 
+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);