LU-13314 utils: fix lfs find time calculation margin

[fs/lustre-release.git] / lustre / utils / mount_utils.h

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index 744d106..604483d 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -112,15 +112,17 @@ struct lustre_disk_data {
 /* used to describe the options to format the lustre disk, not persistent */
 struct mkfs_opts {
        struct lustre_disk_data mo_ldd; /* to be written in MOUNT_DATA_FILE */
-       char    mo_device[128];   /* disk device name */
-       char    **mo_pool_vdevs;  /* list of pool vdevs */
-       char    mo_loopdev[128];  /* in case a loop dev is needed */
-       char    mo_mkfsopts[512]; /* options to the backing-store mkfs */
-       char    *mo_mountopts;    /* mount options for backing fs */
-       __u64   mo_device_kb;     /* in KB */
-       int     mo_stripe_count;
-       int     mo_flags;
-       int     mo_mgs_failnodes;
+       char            mo_device[128];   /* disk device name */
+       char            **mo_pool_vdevs;  /* list of pool vdevs */
+       char            mo_loopdev[128];  /* in case a loop dev is needed */
+       char            mo_mkfsopts[512]; /* options for backing-store mkfs */
+       char            *mo_mountopts;    /* mount options for backing fs */
+       long long       mo_device_kb;     /* in KB */
+       int             mo_blocksize_kb;  /* blocksize in KB */
+       int             mo_stripe_count;
+       int             mo_flags;
+       int             mo_mgs_failnodes;
+       int             mo_inode_size;
 };
 #endif
 
@@ -149,9 +151,9 @@ struct mount_opts {
 #ifdef HAVE_SERVER_SUPPORT
 int get_mountdata(char *, struct lustre_disk_data *);
 
-static inline char *mt_str(enum ldd_mount_type mt)
+static inline const char *mt_str(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "ext3",
                "ldiskfs",
                "smfs",
@@ -162,9 +164,9 @@ static inline char *mt_str(enum ldd_mount_type mt)
        return mount_type_string[mt];
 }
 
-static inline char *mt_type(enum ldd_mount_type mt)
+static inline const char *mt_type(enum ldd_mount_type mt)
 {
-       static char *mount_type_string[] = {
+       static const char * const mount_type_string[] = {
                "osd-ldiskfs",
                "osd-ldiskfs",
                "osd-smfs",