From: Bobi Jam <bobijam@whamcloud.com>
Date: Thu, 18 Oct 2012 10:10:09 +0000 (+0800)
Subject: LU-1279 utils: mount.lustre load ptlrpc module if necessary
X-Git-Tag: 2.3.55~49
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d8d9b78a5c08eb1d938ab9e3bdaf7f756bfbb5ec;ds=sidebyside

LU-1279 utils: mount.lustre load ptlrpc module if necessary

When LNET modules have not loaded, and mounting multiple targets at
the same time could fail. Use mount.lustre to load the network modules
if necessary.

Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: I9d7a4007cc5b233055a4a985237b01ff0874cf54
Reviewed-on: http://review.whamcloud.com/4292
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
---

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index fe1920f..374815e 100644
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -514,6 +514,12 @@ int main(int argc, char *const argv[])
 	progname = strrchr(argv[0], '/');
 	progname = progname ? progname + 1 : argv[0];
 
+	/*
+	 * LU-1279. When LNET modules have not loaded, and mounting multiple
+	 * targets at the same time could fail.
+	 */
+	rc = system("/sbin/modprobe ptlrpc 2>&1 > /dev/null");
+
 	set_defaults(&mop);
 
 	rc = osd_init();