staging: lustre: uapi: move lustre_param.h to uapi directory
authorJames Simmons <jsimmons@infradead.org>
Sun, 20 Aug 2017 02:26:12 +0000 (22:26 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Aug 2017 01:36:48 +0000 (18:36 -0700)
Move the header lustre_param.h to proper uapi directory.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/24325
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h [new file with mode: 0644]
drivers/staging/lustre/lustre/include/lustre_param.h [deleted file]
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/lov/lov_obd.c
drivers/staging/lustre/lustre/mdc/mdc_request.c
drivers/staging/lustre/lustre/obdclass/obd_config.c
drivers/staging/lustre/lustre/obdclass/obd_mount.c
drivers/staging/lustre/lustre/osc/osc_request.c
drivers/staging/lustre/lustre/ptlrpc/sec_config.c

diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h
new file mode 100644 (file)
index 0000000..f6f4752
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2015, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/include/lustre_param.h
+ *
+ * User-settable parameter keys
+ *
+ * Author: Nathan Rutman <nathan@clusterfs.com>
+ */
+
+#ifndef _LUSTRE_PARAM_H
+#define _LUSTRE_PARAM_H
+
+/** \defgroup param param
+ *
+ * @{
+ */
+
+/****************** User-settable parameter keys *********************/
+/* e.g.
+       tunefs.lustre --param="failover.node=192.168.0.13@tcp0" /dev/sda
+       lctl conf_param testfs-OST0000 failover.node=3@elan,192.168.0.3@tcp0
+                   ... testfs-MDT0000.lov.stripesize=4M
+                   ... testfs-OST0000.ost.client_cache_seconds=15
+                   ... testfs.sys.timeout=<secs>
+                   ... testfs.llite.max_read_ahead_mb=16
+*/
+
+/* System global or special params not handled in obd's proc
+ * See mgs_write_log_sys()
+ */
+#define PARAM_TIMEOUT        "timeout="          /* global */
+#define PARAM_LDLM_TIMEOUT      "ldlm_timeout="     /* global */
+#define PARAM_AT_MIN          "at_min="           /* global */
+#define PARAM_AT_MAX          "at_max="           /* global */
+#define PARAM_AT_EXTRA      "at_extra="         /* global */
+#define PARAM_AT_EARLY_MARGIN      "at_early_margin="  /* global */
+#define PARAM_AT_HISTORY          "at_history="       /* global */
+#define PARAM_JOBID_VAR                   "jobid_var="        /* global */
+#define PARAM_MGSNODE        "mgsnode="          /* only at mounttime */
+#define PARAM_FAILNODE      "failover.node="    /* add failover nid */
+#define PARAM_FAILMODE      "failover.mode="    /* initial mount only */
+#define PARAM_ACTIVE          "active="           /* activate/deactivate */
+#define PARAM_NETWORK        "network="          /* bind on nid */
+#define PARAM_ID_UPCALL                "identity_upcall="  /* identity upcall */
+
+/* Prefixes for parameters handled by obd's proc methods (XXX_process_config) */
+#define PARAM_OST                "ost."
+#define PARAM_OSD              "osd."
+#define PARAM_OSC                "osc."
+#define PARAM_MDT                "mdt."
+#define PARAM_MDD                "mdd."
+#define PARAM_MDC                "mdc."
+#define PARAM_LLITE            "llite."
+#define PARAM_LOV                "lov."
+#define PARAM_LOD              "lod."
+#define PARAM_OSP              "osp."
+#define PARAM_SYS                "sys."              /* global */
+#define PARAM_SRPC              "srpc."
+#define PARAM_SRPC_FLVR            "srpc.flavor."
+#define PARAM_SRPC_UDESC          "srpc.udesc.cli2mdt"
+#define PARAM_SEC                "security."
+#define PARAM_QUOTA            "quota."            /* global */
+
+/** @} param */
+
+#endif /* _LUSTRE_PARAM_H */
diff --git a/drivers/staging/lustre/lustre/include/lustre_param.h b/drivers/staging/lustre/lustre/include/lustre_param.h
deleted file mode 100644 (file)
index f6f4752..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2015, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * lustre/include/lustre_param.h
- *
- * User-settable parameter keys
- *
- * Author: Nathan Rutman <nathan@clusterfs.com>
- */
-
-#ifndef _LUSTRE_PARAM_H
-#define _LUSTRE_PARAM_H
-
-/** \defgroup param param
- *
- * @{
- */
-
-/****************** User-settable parameter keys *********************/
-/* e.g.
-       tunefs.lustre --param="failover.node=192.168.0.13@tcp0" /dev/sda
-       lctl conf_param testfs-OST0000 failover.node=3@elan,192.168.0.3@tcp0
-                   ... testfs-MDT0000.lov.stripesize=4M
-                   ... testfs-OST0000.ost.client_cache_seconds=15
-                   ... testfs.sys.timeout=<secs>
-                   ... testfs.llite.max_read_ahead_mb=16
-*/
-
-/* System global or special params not handled in obd's proc
- * See mgs_write_log_sys()
- */
-#define PARAM_TIMEOUT        "timeout="          /* global */
-#define PARAM_LDLM_TIMEOUT      "ldlm_timeout="     /* global */
-#define PARAM_AT_MIN          "at_min="           /* global */
-#define PARAM_AT_MAX          "at_max="           /* global */
-#define PARAM_AT_EXTRA      "at_extra="         /* global */
-#define PARAM_AT_EARLY_MARGIN      "at_early_margin="  /* global */
-#define PARAM_AT_HISTORY          "at_history="       /* global */
-#define PARAM_JOBID_VAR                   "jobid_var="        /* global */
-#define PARAM_MGSNODE        "mgsnode="          /* only at mounttime */
-#define PARAM_FAILNODE      "failover.node="    /* add failover nid */
-#define PARAM_FAILMODE      "failover.mode="    /* initial mount only */
-#define PARAM_ACTIVE          "active="           /* activate/deactivate */
-#define PARAM_NETWORK        "network="          /* bind on nid */
-#define PARAM_ID_UPCALL                "identity_upcall="  /* identity upcall */
-
-/* Prefixes for parameters handled by obd's proc methods (XXX_process_config) */
-#define PARAM_OST                "ost."
-#define PARAM_OSD              "osd."
-#define PARAM_OSC                "osc."
-#define PARAM_MDT                "mdt."
-#define PARAM_MDD                "mdd."
-#define PARAM_MDC                "mdc."
-#define PARAM_LLITE            "llite."
-#define PARAM_LOV                "lov."
-#define PARAM_LOD              "lod."
-#define PARAM_OSP              "osp."
-#define PARAM_SYS                "sys."              /* global */
-#define PARAM_SRPC              "srpc."
-#define PARAM_SRPC_FLVR            "srpc.flavor."
-#define PARAM_SRPC_UDESC          "srpc.udesc.cli2mdt"
-#define PARAM_SEC                "security."
-#define PARAM_QUOTA            "quota."            /* global */
-
-/** @} param */
-
-#endif /* _LUSTRE_PARAM_H */
index e7d52283c921ddfd2e1be88ee502c308ed1de09b..3ab3a6317d5560178ccabb2d3b4a3f28f900874f 100644 (file)
@@ -46,7 +46,7 @@
 #include "../include/lustre_dlm.h"
 #include "../include/lprocfs_status.h"
 #include "../include/lustre_disk.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/lustre_log.h"
 #include "../include/cl_object.h"
 #include "../include/obd_cksum.h"
index 8777d4bfc9fd104adae9709425a0e9ea4c21d149..475bf7e2b59407f4d9044c90df1519134f634e2e 100644 (file)
@@ -49,7 +49,7 @@
 #include "../include/lustre_lib.h"
 #include "../include/lustre_mds.h"
 #include "../include/lustre_net.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/lustre_swab.h"
 #include "../include/lprocfs_status.h"
 #include "../include/obd_class.h"
index 93fb1950c8180fa3586041216ac659dcfe0edfe2..4dcf390245e73036644a25e0a8d028c51f46a41f 100644 (file)
@@ -49,7 +49,7 @@
 #include "../include/lustre_kernelcomm.h"
 #include "../include/lustre_lmv.h"
 #include "../include/lustre_log.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/lustre_swab.h"
 #include "../include/obd_class.h"
 
index 2a93d67cfb8e8bdfa50cc3e85b502dd5ff8ead38..783f9e05ed857474f5d56d7ac5d3b1d2c0867eb1 100644 (file)
@@ -42,7 +42,7 @@
 #include "../include/llog_swab.h"
 #include "../include/lprocfs_status.h"
 #include "../include/lustre_log.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/obd_class.h"
 
 #include "llog_internal.h"
index 8e0d4b1d86dc29706e1818a3979df7a72bb9cfff..555e67e11a9dc6273cc2a8b42c7ceaa23381dce6 100644 (file)
@@ -46,7 +46,7 @@
 #include "../include/lustre/lustre_user.h"
 #include "../include/lustre_log.h"
 #include "../include/lustre_disk.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 
 static int (*client_fill_super)(struct super_block *sb,
                                struct vfsmount *mnt);
index e103d5ab3a9a65ddca6fae8048dc3bd7850a036e..453a59a31f61bde8bcea962f5efb7b2b45bad2fd 100644 (file)
@@ -44,7 +44,7 @@
 #include "../../include/uapi/linux/lustre/lustre_ioctl.h"
 #include "../include/lustre_debug.h"
 #include "../include/lustre_obdo.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/lustre_fid.h"
 #include "../include/obd_class.h"
 #include "../include/obd.h"
index 2181a85efd4927dbcfcd6e8b5013e60082b069aa..bb953d40f4c761f696a3de1657c3cefb455da935 100644 (file)
@@ -39,7 +39,7 @@
 #include "../include/obd.h"
 #include "../include/obd_support.h"
 #include "../include/lustre_import.h"
-#include "../include/lustre_param.h"
+#include "../../include/uapi/linux/lustre/lustre_param.h"
 #include "../include/lustre_sec.h"
 
 #include "ptlrpc_internal.h"