Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13124 scrub: check for multiple linked file
[fs/lustre-release.git]
/
lustre
/
osd-ldiskfs
/
osd_oi.h
diff --git
a/lustre/osd-ldiskfs/osd_oi.h
b/lustre/osd-ldiskfs/osd_oi.h
index
e278411
..
95056c0
100644
(file)
--- 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
*
* 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
*/
*
* GPL HEADER END
*/
@@
-27,11
+23,10
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* lustre/osd/osd_oi.h
*
*
* lustre/osd/osd_oi.h
*
@@
-57,10
+52,9
@@
#include <lu_object.h>
#include <md_object.h>
#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;
struct lu_fid;
struct osd_thread_info;
@@
-136,8
+130,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,
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);
int osd_oi_mod_init(void);
int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd,
bool restored);