LU-2800 autoconf: remove bio_endio args test

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

diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h
index d7c965a..7f9cda8 100644 (file)
--- a/lustre/utils/mount_utils.h
+++ b/lustre/utils/mount_utils.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,6 +37,17 @@
 #ifndef _MOUNT_UTILS_H_
 #define _MOUNT_UTILS_H_
 
+/* Some of the userland headers for libzfs also require
+ * zfs/spl linux kernel headers, but including these pull
+ * in linux kernel headers which conflicts with the
+ * userland version of libcfs. So the solution is tell the
+ * libzfs user land headrs that the zfs/spl kernel headers
+ * are already included even if this is not the case.
+ */
+#ifdef HAVE_ZFS_OSD
+#define _SPL_ZFS_H
+#define _SPL_SIGNAL_H
+#endif
 #include <lustre_disk.h>
 #include <lustre_param.h>
 
@@ -52,6 +63,7 @@ extern int failover;
 #define MO_FORCEFORMAT         0x02
 #define MO_FAILOVER            0x04
 #define MO_DRYRUN              0x08
+#define MO_QUOTA               0x10
 
 #define MAX_LOOP_DEVICES       16
 #define INDEX_UNASSIGNED       0xFFFF
@@ -119,7 +131,7 @@ int read_local_files(struct mkfs_opts *mop);
 int is_lustre_target(struct mkfs_opts *mop);
 
 /* loopback helper functions */
-int file_create(char *path, int size);
+int file_create(char *path, __u64 size);
 int loop_format(struct mkfs_opts *mop);
 int loop_setup(struct mkfs_opts *mop);
 int loop_cleanup(struct mkfs_opts *mop);
@@ -134,6 +146,7 @@ int osd_prepare_lustre(struct mkfs_opts *mop,
                       char *always_mountopts, int always_len);
 int osd_tune_lustre(char *dev, struct mount_opts *mop);
 int osd_label_lustre(struct mount_opts *mop);
+int osd_enable_quota(struct mkfs_opts *mop);
 int osd_init(void);
 void osd_fini(void);
 
@@ -146,6 +159,7 @@ int ldiskfs_prepare_lustre(struct mkfs_opts *mop,
                           char *always_mountopts, int always_len);
 int ldiskfs_tune_lustre(char *dev, struct mount_opts *mop);
 int ldiskfs_label_lustre(struct mount_opts *mop);
+int ldiskfs_enable_quota(struct mkfs_opts *mop);
 int ldiskfs_init(void);
 void ldiskfs_fini(void);