* [PATCH v2 1/6] staging: lustre: move module info to end of libcfs module.c file
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 1:07 ` [PATCH v2 2/6] staging: lustre: add missing MODULE_AUTHOR for LNet selftest module James Simmons
` (5 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, James Simmons
Move the MODULE_* field in module.c that belongs to libcfs to the
end of the file like it is done for other kernel drivers.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/libcfs/module.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 05e2c56..de6688e 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -66,10 +66,6 @@
#include "../../include/linux/lnet/lnet.h"
#include "tracefile.h"
-MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Portals v3.1");
-MODULE_LICENSE("GPL");
-
static struct dentry *lnet_debugfs_root;
/* called when opening /dev/device */
@@ -668,7 +664,10 @@ static void exit_libcfs_module(void)
pr_err("LustreError: libcfs_debug_cleanup: %d\n", rc);
}
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Portals v3.1");
MODULE_VERSION("1.0.0");
+MODULE_LICENSE("GPL");
module_init(init_libcfs_module);
module_exit(exit_libcfs_module);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 2/6] staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
2016-02-26 1:07 ` [PATCH v2 1/6] staging: lustre: move module info to end of libcfs module.c file James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 1:07 ` [PATCH v2 3/6] staging: lustre: update the MODULE_VERSION for all lustre modules James Simmons
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, Andreas Dilger
From: Andreas Dilger <andreas.dilger@intel.com>
For LNet selftest module the MODULE_AUTHOR was missing.
Add proper OpenSFS authorship. Broken out of patch
http://review.whamcloud.com/16787.
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16787
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
drivers/staging/lustre/lnet/selftest/module.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/lustre/lnet/selftest/module.c b/drivers/staging/lustre/lnet/selftest/module.c
index cbb7884..3e48b0a 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -148,6 +148,7 @@ error:
return rc;
}
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("LNet Selftest");
MODULE_LICENSE("GPL");
MODULE_VERSION("0.9.0");
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 3/6] staging: lustre: update the MODULE_VERSION for all lustre modules
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
2016-02-26 1:07 ` [PATCH v2 1/6] staging: lustre: move module info to end of libcfs module.c file James Simmons
2016-02-26 1:07 ` [PATCH v2 2/6] staging: lustre: add missing MODULE_AUTHOR for LNet selftest module James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 1:07 ` [PATCH v2 4/6] staging: lustre: update the MODULE_DESCRIPTION " James Simmons
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List,
James Simmons, James Simmons
For several lustre modules the MODULE_VERSION has the wrong value,
located in the wrong place in the source code, or completely missing.
This patch brings it up to date.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16729
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
.../staging/lustre/include/linux/libcfs/libcfs.h | 2 ++
drivers/staging/lustre/include/linux/lnet/types.h | 2 ++
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 +
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2 +-
drivers/staging/lustre/lnet/lnet/module.c | 2 +-
drivers/staging/lustre/lnet/selftest/module.c | 2 +-
drivers/staging/lustre/lustre/fid/fid_request.c | 2 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 1 +
drivers/staging/lustre/lustre/libcfs/module.c | 2 +-
drivers/staging/lustre/lustre/llite/lloop.c | 1 +
drivers/staging/lustre/lustre/llite/super25.c | 1 +
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 1 +
drivers/staging/lustre/lustre/mdc/mdc_request.c | 1 +
drivers/staging/lustre/lustre/mgc/mgc_request.c | 1 +
drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +-
.../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
.../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
17 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 5c598c8..1eab0eb 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -42,6 +42,8 @@
#include "curproc.h"
+#define LIBCFS_VERSION "0.7.0"
+
#define LOWEST_BIT_SET(x) ((x) & ~((x) - 1))
/*
diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index 81d01f1..08f193c 100644
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -39,6 +39,8 @@
* @{
*/
+#define LNET_VERSION "0.6.0"
+
/** \addtogroup lnet_addr
* @{
*/
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 98570b3..80f7985 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2868,6 +2868,7 @@ static int __init kiblnd_module_init(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Kernel OpenIB gen2 LND v2.00");
+MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
module_init(kiblnd_module_init);
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index 854814c..c37ebcf 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -2926,8 +2926,8 @@ ksocknal_module_init(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Kernel TCP Socket LND v3.0.0");
+MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
-MODULE_VERSION("3.0.0");
module_init(ksocknal_module_init);
module_exit(ksocknal_module_fini);
diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c
index e12fe37..4923339 100644
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@@ -225,8 +225,8 @@ fini_lnet(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("LNet v3.1");
+MODULE_VERSION(LNET_VERSION);
MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0");
module_init(init_lnet);
module_exit(fini_lnet);
diff --git a/drivers/staging/lustre/lnet/selftest/module.c b/drivers/staging/lustre/lnet/selftest/module.c
index 3e48b0a..05c1de1 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -150,8 +150,8 @@ error:
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("LNet Selftest");
+MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
-MODULE_VERSION("0.9.0");
module_init(lnet_selftest_init);
module_exit(lnet_selftest_fini);
diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index 70400aa..d832796 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -466,8 +466,8 @@ static void __exit fid_mod_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre FID Module");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-MODULE_VERSION("0.1.0");
module_init(fid_mod_init);
module_exit(fid_mod_exit);
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c
index 19b81c9..f3f95b8 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -501,6 +501,7 @@ static void __exit fld_mod_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre FLD");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
module_init(fld_mod_init)
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index de6688e..778cfe3 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -666,7 +666,7 @@ static void exit_libcfs_module(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Portals v3.1");
-MODULE_VERSION("1.0.0");
+MODULE_VERSION(LIBCFS_VERSION);
MODULE_LICENSE("GPL");
module_init(init_libcfs_module);
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 3f53292..8550a9b 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -878,4 +878,5 @@ module_param(max_loop, int, 0444);
MODULE_PARM_DESC(max_loop, "maximum of lloop_device");
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre virtual block device");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 79e1322..3fb9f62 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -210,6 +210,7 @@ static void __exit exit_lustre_lite(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Lite Client File System");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
module_init(init_lustre_lite);
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 68afc29..7102cbf 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2784,6 +2784,7 @@ static void lmv_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
module_init(lmv_init);
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 7bdb205..a4f3e70 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -2537,6 +2537,7 @@ static void /*__exit*/ mdc_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Metadata Client");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
module_init(mdc_init);
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 68c3c84..f5a85bb 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1748,6 +1748,7 @@ static void /*__exit*/ mgc_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Management Client");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
module_init(mgc_init);
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 06b04d2..8e6b8c9 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -577,8 +577,8 @@ static void cleanup_obdclass(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Class Driver Build Version: " LUSTRE_VERSION_STRING);
-MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
+MODULE_LICENSE("GPL");
module_init(init_obdclass);
module_exit(cleanup_obdclass);
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index ab56e67..77e0196 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1890,8 +1890,8 @@ static void /*__exit*/ obdecho_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Testing Echo OBD driver");
-MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
+MODULE_LICENSE("GPL");
module_init(obdecho_init);
module_exit(obdecho_exit);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
index c4f1d0f..a8ec0e9 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
@@ -162,8 +162,8 @@ static void __exit ptlrpc_exit(void)
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Request Processor and Lock Management");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0");
module_init(ptlrpc_init);
module_exit(ptlrpc_exit);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 4/6] staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
` (2 preceding siblings ...)
2016-02-26 1:07 ` [PATCH v2 3/6] staging: lustre: update the MODULE_VERSION for all lustre modules James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 1:07 ` [PATCH v2 5/6] staging: lustre: make module_init/exit naming consistent James Simmons
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, Andreas Dilger
From: Andreas Dilger <andreas.dilger@intel.com>
Fixup the MODULE_DESCRIPTION for several lustre modules. Some wrongly
place the version in the string or they are not descriptive enough.
Broken out of patch http://review.whamcloud.com/16787.
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16787
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2 +-
drivers/staging/lustre/lnet/lnet/module.c | 2 +-
drivers/staging/lustre/lustre/fid/fid_request.c | 2 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 2 +-
drivers/staging/lustre/lustre/libcfs/module.c | 2 +-
drivers/staging/lustre/lustre/llite/super25.c | 2 +-
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 +-
drivers/staging/lustre/lustre/lov/lov_obd.c | 2 +-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +-
.../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 80f7985..b883b67 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2867,7 +2867,7 @@ static int __init kiblnd_module_init(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Kernel OpenIB gen2 LND v2.00");
+MODULE_DESCRIPTION("OpenIB gen2 LNet Network Driver");
MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index c37ebcf..9b9eb0f 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -2925,7 +2925,7 @@ ksocknal_module_init(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Kernel TCP Socket LND v3.0.0");
+MODULE_DESCRIPTION("TCP Socket LNet Network Driver");
MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c
index 4923339..da3eb33 100644
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@@ -224,7 +224,7 @@ fini_lnet(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("LNet v3.1");
+MODULE_DESCRIPTION("Lustre Networking layer");
MODULE_VERSION(LNET_VERSION);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index d832796..a20b8ea 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -465,7 +465,7 @@ static void __exit fid_mod_exit(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre FID Module");
+MODULE_DESCRIPTION("Lustre File IDentifier");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c
index f3f95b8..b4f6c4f 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -500,7 +500,7 @@ static void __exit fld_mod_exit(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre FLD");
+MODULE_DESCRIPTION("Lustre FID Location Database");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 778cfe3..d856b55 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -665,7 +665,7 @@ static void exit_libcfs_module(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Portals v3.1");
+MODULE_DESCRIPTION("Lustre helper library");
MODULE_VERSION(LIBCFS_VERSION);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 3fb9f62..1337f69 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -209,7 +209,7 @@ static void __exit exit_lustre_lite(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Lite Client File System");
+MODULE_DESCRIPTION("Lustre Client File System");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 7102cbf..5c055a0 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2783,7 +2783,7 @@ static void lmv_exit(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
+MODULE_DESCRIPTION("Lustre Logical Metadata Volume");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
index 518f1a5..8037eb4 100644
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
@@ -2378,7 +2378,7 @@ static void /*__exit*/ lov_exit(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver");
+MODULE_DESCRIPTION("Lustre Logical Object Volume");
MODULE_LICENSE("GPL");
MODULE_VERSION(LUSTRE_VERSION_STRING);
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8e6b8c9..ca407a2 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -576,7 +576,7 @@ static void cleanup_obdclass(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Class Driver Build Version: " LUSTRE_VERSION_STRING);
+MODULE_DESCRIPTION("Lustre Class Driver");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index 77e0196..a9267d3 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1889,7 +1889,7 @@ static void /*__exit*/ obdecho_exit(void)
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Testing Echo OBD driver");
+MODULE_DESCRIPTION("Lustre Echo Client test driver");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 5/6] staging: lustre: make module_init/exit naming consistent
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
` (3 preceding siblings ...)
2016-02-26 1:07 ` [PATCH v2 4/6] staging: lustre: update the MODULE_DESCRIPTION " James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 1:07 ` [PATCH v2 6/6] staging: lustre: update comment for lnet_lib_init/exit James Simmons
2016-02-26 6:03 ` [PATCH v2 0/6] staging: lustre: update modinfo data Greg Kroah-Hartman
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, Andreas Dilger
From: Andreas Dilger <andreas.dilger@intel.com>
Make the name of the module_init()/_exit() functions consistently
{module_name}_init and {module_name}_exit.
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16787
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
.../staging/lustre/include/linux/lnet/lib-lnet.h | 4 ++--
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 8 ++++----
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 10 ++++------
drivers/staging/lustre/lnet/lnet/api-ni.c | 10 ++++------
drivers/staging/lustre/lnet/lnet/module.c | 16 +++++++---------
drivers/staging/lustre/lnet/selftest/module.c | 6 +++---
drivers/staging/lustre/lustre/fid/fid_request.c | 8 ++++----
drivers/staging/lustre/lustre/fld/fld_request.c | 8 ++++----
drivers/staging/lustre/lustre/libcfs/module.c | 8 ++++----
drivers/staging/lustre/lustre/llite/lloop.c | 6 +++---
drivers/staging/lustre/lustre/llite/super25.c | 8 ++++----
drivers/staging/lustre/lustre/obdclass/class_obd.c | 8 ++++----
12 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index a5f1aec..d78360d 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -450,8 +450,8 @@ lnet_ni_t *lnet_net2ni(__u32 net);
extern int portal_rotor;
-int lnet_init(void);
-void lnet_fini(void);
+int lnet_lib_init(void);
+void lnet_lib_exit(void);
int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, unsigned long when);
void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive,
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index b883b67..56e5784 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2840,12 +2840,12 @@ net_failed:
return -ENETDOWN;
}
-static void __exit kiblnd_module_fini(void)
+static void __exit ko2iblnd_exit(void)
{
lnet_unregister_lnd(&the_o2iblnd);
}
-static int __init kiblnd_module_init(void)
+static int __init ko2iblnd_init(void)
{
int rc;
@@ -2871,5 +2871,5 @@ MODULE_DESCRIPTION("OpenIB gen2 LNet Network Driver");
MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
-module_init(kiblnd_module_init);
-module_exit(kiblnd_module_fini);
+module_init(ko2iblnd_init);
+module_exit(ko2iblnd_exit);
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index 9b9eb0f..d843082 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -2889,14 +2889,12 @@ ksocknal_startup(lnet_ni_t *ni)
return -ENETDOWN;
}
-static void __exit
-ksocknal_module_fini(void)
+static void __exit ksocklnd_exit(void)
{
lnet_unregister_lnd(&the_ksocklnd);
}
-static int __init
-ksocknal_module_init(void)
+static int __init ksocklnd_init(void)
{
int rc;
@@ -2929,5 +2927,5 @@ MODULE_DESCRIPTION("TCP Socket LNet Network Driver");
MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
-module_init(ksocknal_module_init);
-module_exit(ksocknal_module_fini);
+module_init(ksocklnd_init);
+module_exit(ksocklnd_exit);
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 3ecc96a..a911aef 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1386,13 +1386,12 @@ failed:
* Initialize LNet library.
*
* Automatically called at module loading time. Caller has to call
- * lnet_exit() after a call to lnet_init(), if and only if the
+ * lnet_lib_exit() after a call to lnet_lib_init(), if and only if the
* latter returned 0. It must be called exactly once.
*
* \return 0 on success, and -ve on failures.
*/
-int
-lnet_init(void)
+int lnet_lib_init(void)
{
int rc;
@@ -1451,11 +1450,10 @@ lnet_init(void)
/**
* Finalize LNet library.
*
- * \pre lnet_init() called with success.
+ * \pre lnet_lib_init() called with success.
* \pre All LNet users called LNetNIFini() for matching LNetNIInit() calls.
*/
-void
-lnet_fini(void)
+void lnet_lib_exit(void)
{
LASSERT(!the_lnet.ln_refcount);
diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c
index da3eb33..93037c1 100644
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@@ -185,16 +185,15 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
static DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
-static int __init
-init_lnet(void)
+static int __init lnet_init(void)
{
int rc;
mutex_init(&lnet_config_mutex);
- rc = lnet_init();
+ rc = lnet_lib_init();
if (rc) {
- CERROR("lnet_init: error %d\n", rc);
+ CERROR("lnet_lib_init: error %d\n", rc);
return rc;
}
@@ -212,15 +211,14 @@ init_lnet(void)
return 0;
}
-static void __exit
-fini_lnet(void)
+static void __exit lnet_exit(void)
{
int rc;
rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
LASSERT(!rc);
- lnet_fini();
+ lnet_lib_exit();
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
@@ -228,5 +226,5 @@ MODULE_DESCRIPTION("Lustre Networking layer");
MODULE_VERSION(LNET_VERSION);
MODULE_LICENSE("GPL");
-module_init(init_lnet);
-module_exit(fini_lnet);
+module_init(lnet_init);
+module_exit(lnet_exit);
diff --git a/drivers/staging/lustre/lnet/selftest/module.c b/drivers/staging/lustre/lnet/selftest/module.c
index 05c1de1..55082ce 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -54,7 +54,7 @@ struct cfs_wi_sched *lst_sched_serial;
struct cfs_wi_sched **lst_sched_test;
static void
-lnet_selftest_fini(void)
+lnet_selftest_exit(void)
{
int i;
@@ -144,7 +144,7 @@ lnet_selftest_init(void)
lst_init_step = LST_INIT_CONSOLE;
return 0;
error:
- lnet_selftest_fini();
+ lnet_selftest_exit();
return rc;
}
@@ -154,4 +154,4 @@ MODULE_VERSION("2.7.0");
MODULE_LICENSE("GPL");
module_init(lnet_selftest_init);
-module_exit(lnet_selftest_fini);
+module_exit(lnet_selftest_exit);
diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index a20b8ea..39269c3 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -450,7 +450,7 @@ int client_fid_fini(struct obd_device *obd)
}
EXPORT_SYMBOL(client_fid_fini);
-static int __init fid_mod_init(void)
+static int __init fid_init(void)
{
seq_debugfs_dir = ldebugfs_register(LUSTRE_SEQ_NAME,
debugfs_lustre_root,
@@ -458,7 +458,7 @@ static int __init fid_mod_init(void)
return PTR_ERR_OR_ZERO(seq_debugfs_dir);
}
-static void __exit fid_mod_exit(void)
+static void __exit fid_exit(void)
{
if (!IS_ERR_OR_NULL(seq_debugfs_dir))
ldebugfs_remove(&seq_debugfs_dir);
@@ -469,5 +469,5 @@ MODULE_DESCRIPTION("Lustre File IDentifier");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-module_init(fid_mod_init);
-module_exit(fid_mod_exit);
+module_init(fid_init);
+module_exit(fid_exit);
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c
index b4f6c4f..a3d122d 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -485,7 +485,7 @@ void fld_client_flush(struct lu_client_fld *fld)
}
EXPORT_SYMBOL(fld_client_flush);
-static int __init fld_mod_init(void)
+static int __init fld_init(void)
{
fld_debugfs_dir = ldebugfs_register(LUSTRE_FLD_NAME,
debugfs_lustre_root,
@@ -493,7 +493,7 @@ static int __init fld_mod_init(void)
return PTR_ERR_OR_ZERO(fld_debugfs_dir);
}
-static void __exit fld_mod_exit(void)
+static void __exit fld_exit(void)
{
if (!IS_ERR_OR_NULL(fld_debugfs_dir))
ldebugfs_remove(&fld_debugfs_dir);
@@ -504,5 +504,5 @@ MODULE_DESCRIPTION("Lustre FID Location Database");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-module_init(fld_mod_init)
-module_exit(fld_mod_exit)
+module_init(fld_init)
+module_exit(fld_exit)
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index d856b55..5d52673 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -585,7 +585,7 @@ static void lustre_remove_debugfs(void)
lnet_debugfs_root = NULL;
}
-static int init_libcfs_module(void)
+static int libcfs_init(void)
{
int rc;
@@ -641,7 +641,7 @@ cleanup_cpu:
return rc;
}
-static void exit_libcfs_module(void)
+static void libcfs_exit(void)
{
int rc;
@@ -669,5 +669,5 @@ MODULE_DESCRIPTION("Lustre helper library");
MODULE_VERSION(LIBCFS_VERSION);
MODULE_LICENSE("GPL");
-module_init(init_libcfs_module);
-module_exit(exit_libcfs_module);
+module_init(libcfs_init);
+module_exit(libcfs_exit);
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 8550a9b..b725fc1 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -871,12 +871,12 @@ static void lloop_exit(void)
kfree(loop_dev);
}
-module_init(lloop_init);
-module_exit(lloop_exit);
-
module_param(max_loop, int, 0444);
MODULE_PARM_DESC(max_loop, "maximum of lloop_device");
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre virtual block device");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
+
+module_init(lloop_init);
+module_exit(lloop_exit);
diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 1337f69..5c20804 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -89,7 +89,7 @@ MODULE_ALIAS_FS("lustre");
void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
-static int __init init_lustre_lite(void)
+static int __init lustre_init(void)
{
lnet_process_id_t lnet_id;
struct timespec64 ts;
@@ -188,7 +188,7 @@ out_cache:
return rc;
}
-static void __exit exit_lustre_lite(void)
+static void __exit lustre_exit(void)
{
lustre_register_client_fill_super(NULL);
lustre_register_kill_super_cb(NULL);
@@ -213,5 +213,5 @@ MODULE_DESCRIPTION("Lustre Client File System");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-module_init(init_lustre_lite);
-module_exit(exit_lustre_lite);
+module_init(lustre_init);
+module_exit(lustre_exit);
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index ca407a2..1a938e1 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -473,7 +473,7 @@ static int obd_init_checks(void)
extern int class_procfs_init(void);
extern int class_procfs_clean(void);
-static int __init init_obdclass(void)
+static int __init obdclass_init(void)
{
int i, err;
@@ -543,7 +543,7 @@ static int __init init_obdclass(void)
return err;
}
-static void cleanup_obdclass(void)
+static void obdclass_exit(void)
{
int i;
@@ -580,5 +580,5 @@ MODULE_DESCRIPTION("Lustre Class Driver");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-module_init(init_obdclass);
-module_exit(cleanup_obdclass);
+module_init(obdclass_init);
+module_exit(obdclass_exit);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 6/6] staging: lustre: update comment for lnet_lib_init/exit
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
` (4 preceding siblings ...)
2016-02-26 1:07 ` [PATCH v2 5/6] staging: lustre: make module_init/exit naming consistent James Simmons
@ 2016-02-26 1:07 ` James Simmons
2016-02-26 6:03 ` [PATCH v2 0/6] staging: lustre: update modinfo data Greg Kroah-Hartman
6 siblings, 0 replies; 12+ messages in thread
From: James Simmons @ 2016-02-26 1:07 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, Andreas Dilger
From: Andreas Dilger <andreas.dilger@intel.com>
The documentation about the return values for lnet_lib_init
and lnet_lib_exit was in the old style format. Bring it in
sync with the rest of the LNet core. Broken out of patch 16787.
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6204
Reviewed-on: http://review.whamcloud.com/16787
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
drivers/staging/lustre/lnet/lnet/api-ni.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index a911aef..aa24489 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1389,7 +1389,8 @@ failed:
* lnet_lib_exit() after a call to lnet_lib_init(), if and only if the
* latter returned 0. It must be called exactly once.
*
- * \return 0 on success, and -ve on failures.
+ * \retval 0 on success
+ * \retval -ve on failures.
*/
int lnet_lib_init(void)
{
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 0/6] staging: lustre: update modinfo data
2016-02-26 1:07 [PATCH v2 0/6] staging: lustre: update modinfo data James Simmons
` (5 preceding siblings ...)
2016-02-26 1:07 ` [PATCH v2 6/6] staging: lustre: update comment for lnet_lib_init/exit James Simmons
@ 2016-02-26 6:03 ` Greg Kroah-Hartman
2016-02-26 6:11 ` [lustre-devel] " Drokin, Oleg
6 siblings, 1 reply; 12+ messages in thread
From: Greg Kroah-Hartman @ 2016-02-26 6:03 UTC (permalink / raw)
To: James Simmons
Cc: devel, Andreas Dilger, Oleg Drokin, Linux Kernel Mailing List,
Lustre Development List
On Thu, Feb 25, 2016 at 08:07:06PM -0500, James Simmons wrote:
> The module information for Lustre is stale or in some cases
> completely missing. This collection of patches brings the
> modinfo up to date as well as filling in any missing information.
> This patch set has been redone to rebase it on Oleg's latest
> patch set to avoid collisons in merging.
>
> Andreas Dilger (4):
> staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
> staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
> staging: lustre: make module_init/exit naming consistent
> staging: lustre: update comment for lnet_lib_init/exit
>
> James Simmons (2):
> staging: lustre: move module info to end of libcfs module.c file
> staging: lustre: update the MODULE_VERSION for all lustre modules
What changed to need a v2 of this series?
Please ALWAYS say what the difference is, don't expect us to "just
know".
Please send a v3 of this, describing the changes, in the correct format,
in each patch. You know better than this...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [lustre-devel] [PATCH v2 0/6] staging: lustre: update modinfo data
2016-02-26 6:03 ` [PATCH v2 0/6] staging: lustre: update modinfo data Greg Kroah-Hartman
@ 2016-02-26 6:11 ` Drokin, Oleg
2016-02-26 6:25 ` Greg Kroah-Hartman
0 siblings, 1 reply; 12+ messages in thread
From: Drokin, Oleg @ 2016-02-26 6:11 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: James Simmons, <devel@driverdev.osuosl.org>,
Linux Kernel Mailing List, Lustre Development List
On Feb 26, 2016, at 1:03 AM, Greg Kroah-Hartman wrote:
> On Thu, Feb 25, 2016 at 08:07:06PM -0500, James Simmons wrote:
>> The module information for Lustre is stale or in some cases
>> completely missing. This collection of patches brings the
>> modinfo up to date as well as filling in any missing information.
>> This patch set has been redone to rebase it on Oleg's latest
>> patch set to avoid collisons in merging.
>>
>> Andreas Dilger (4):
>> staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
>> staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
>> staging: lustre: make module_init/exit naming consistent
>> staging: lustre: update comment for lnet_lib_init/exit
>>
>> James Simmons (2):
>> staging: lustre: move module info to end of libcfs module.c file
>> staging: lustre: update the MODULE_VERSION for all lustre modules
>
> What changed to need a v2 of this series?
>
> Please ALWAYS say what the difference is, don't expect us to "just
> know".
>
> Please send a v3 of this, describing the changes, in the correct format,
> in each patch. You know better than this…
I think it says above that the rebase was done on top of my patchset
to resolve the conflict that arose?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [lustre-devel] [PATCH v2 0/6] staging: lustre: update modinfo data
2016-02-26 6:11 ` [lustre-devel] " Drokin, Oleg
@ 2016-02-26 6:25 ` Greg Kroah-Hartman
2016-02-26 15:46 ` Simmons, James A.
0 siblings, 1 reply; 12+ messages in thread
From: Greg Kroah-Hartman @ 2016-02-26 6:25 UTC (permalink / raw)
To: Drokin, Oleg
Cc: James Simmons, devel, devel, Linux Kernel Mailing List,
Lustre Development List
On Fri, Feb 26, 2016 at 06:11:07AM +0000, Drokin, Oleg wrote:
>
> On Feb 26, 2016, at 1:03 AM, Greg Kroah-Hartman wrote:
>
> > On Thu, Feb 25, 2016 at 08:07:06PM -0500, James Simmons wrote:
> >> The module information for Lustre is stale or in some cases
> >> completely missing. This collection of patches brings the
> >> modinfo up to date as well as filling in any missing information.
> >> This patch set has been redone to rebase it on Oleg's latest
> >> patch set to avoid collisons in merging.
> >>
> >> Andreas Dilger (4):
> >> staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
> >> staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
> >> staging: lustre: make module_init/exit naming consistent
> >> staging: lustre: update comment for lnet_lib_init/exit
> >>
> >> James Simmons (2):
> >> staging: lustre: move module info to end of libcfs module.c file
> >> staging: lustre: update the MODULE_VERSION for all lustre modules
> >
> > What changed to need a v2 of this series?
> >
> > Please ALWAYS say what the difference is, don't expect us to "just
> > know".
> >
> > Please send a v3 of this, describing the changes, in the correct format,
> > in each patch. You know better than this…
>
> I think it says above that the rebase was done on top of my patchset
> to resolve the conflict that arose?
Where? Ugh, yeah, kind of, but where is the big v2: marking or some
such thing like is required? It's very easy to miss this (as I did.)
Please make it easy for maintainers, not hard on them...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [lustre-devel] [PATCH v2 0/6] staging: lustre: update modinfo data
2016-02-26 6:25 ` Greg Kroah-Hartman
@ 2016-02-26 15:46 ` Simmons, James A.
2016-02-26 16:18 ` 'Greg Kroah-Hartman'
0 siblings, 1 reply; 12+ messages in thread
From: Simmons, James A. @ 2016-02-26 15:46 UTC (permalink / raw)
To: 'Greg Kroah-Hartman', Drokin, Oleg
Cc: devel, Linux Kernel Mailing List, Lustre Development List
>On Fri, Feb 26, 2016 at 06:11:07AM +0000, Drokin, Oleg wrote:
>>
>> On Feb 26, 2016, at 1:03 AM, Greg Kroah-Hartman wrote:
>>
>> > On Thu, Feb 25, 2016 at 08:07:06PM -0500, James Simmons wrote:
>> >> The module information for Lustre is stale or in some cases
>> >> completely missing. This collection of patches brings the
>> >> modinfo up to date as well as filling in any missing information.
>> >> This patch set has been redone to rebase it on Oleg's latest
>> >> patch set to avoid collisons in merging.
>> >>
>> >> Andreas Dilger (4):
>> >> staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
>> >> staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
>> >> staging: lustre: make module_init/exit naming consistent
>> >> staging: lustre: update comment for lnet_lib_init/exit
>> >>
>> >> James Simmons (2):
>> >> staging: lustre: move module info to end of libcfs module.c file
>> >> staging: lustre: update the MODULE_VERSION for all lustre modules
>> >
>> > What changed to need a v2 of this series?
>> >
>> > Please ALWAYS say what the difference is, don't expect us to "just
>> > know".
>> >
>> > Please send a v3 of this, describing the changes, in the correct format,
>> > in each patch. You know better than this…
>>
>> I think it says above that the rebase was done on top of my patchset
>> to resolve the conflict that arose?
>
>Where? Ugh, yeah, kind of, but where is the big v2: marking or some
>such thing like is required? It's very easy to miss this (as I did.)
>Please make it easy for maintainers, not hard on them...
Sorry, in the future I will add a ChangeLog section for newer versions of patches.
The good news is the patches from Oleg's that conflicted landed already which
means the this patch set is ready to land.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [lustre-devel] [PATCH v2 0/6] staging: lustre: update modinfo data
2016-02-26 15:46 ` Simmons, James A.
@ 2016-02-26 16:18 ` 'Greg Kroah-Hartman'
0 siblings, 0 replies; 12+ messages in thread
From: 'Greg Kroah-Hartman' @ 2016-02-26 16:18 UTC (permalink / raw)
To: Simmons, James A.
Cc: Drokin, Oleg, devel, Linux Kernel Mailing List, Lustre Development List
On Fri, Feb 26, 2016 at 03:46:02PM +0000, Simmons, James A. wrote:
> >On Fri, Feb 26, 2016 at 06:11:07AM +0000, Drokin, Oleg wrote:
> >>
> >> On Feb 26, 2016, at 1:03 AM, Greg Kroah-Hartman wrote:
> >>
> >> > On Thu, Feb 25, 2016 at 08:07:06PM -0500, James Simmons wrote:
> >> >> The module information for Lustre is stale or in some cases
> >> >> completely missing. This collection of patches brings the
> >> >> modinfo up to date as well as filling in any missing information.
> >> >> This patch set has been redone to rebase it on Oleg's latest
> >> >> patch set to avoid collisons in merging.
> >> >>
> >> >> Andreas Dilger (4):
> >> >> staging: lustre: add missing MODULE_AUTHOR for LNet selftest module
> >> >> staging: lustre: update the MODULE_DESCRIPTION for all lustre modules
> >> >> staging: lustre: make module_init/exit naming consistent
> >> >> staging: lustre: update comment for lnet_lib_init/exit
> >> >>
> >> >> James Simmons (2):
> >> >> staging: lustre: move module info to end of libcfs module.c file
> >> >> staging: lustre: update the MODULE_VERSION for all lustre modules
> >> >
> >> > What changed to need a v2 of this series?
> >> >
> >> > Please ALWAYS say what the difference is, don't expect us to "just
> >> > know".
> >> >
> >> > Please send a v3 of this, describing the changes, in the correct format,
> >> > in each patch. You know better than this…
> >>
> >> I think it says above that the rebase was done on top of my patchset
> >> to resolve the conflict that arose?
> >
> >Where? Ugh, yeah, kind of, but where is the big v2: marking or some
> >such thing like is required? It's very easy to miss this (as I did.)
> >Please make it easy for maintainers, not hard on them...
>
> Sorry, in the future I will add a ChangeLog section for newer versions of patches.
> The good news is the patches from Oleg's that conflicted landed already which
> means the this patch set is ready to land.
Can you please resend it with the proper format? It's out of my queue
now...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread