landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / utils / llmount.c

diff --git a/lustre/utils/llmount.c b/lustre/utils/llmount.c
index 1270f91..980f9fe 100644 (file)
--- a/lustre/utils/llmount.c
+++ b/lustre/utils/llmount.c
@@ -70,7 +70,7 @@ update_mtab_entry(char *spec, char *node, char *type, char *opts,
 int
 init_options(struct lustre_mount_data *lmd)
 {
-        memset(lmd, 0, sizeof(lmd));
+        memset(lmd, 0, sizeof(*lmd));
         lmd->lmd_magic = LMD_MAGIC;
         lmd->lmd_server_nid = PTL_NID_ANY;
         lmd->lmd_local_nid = PTL_NID_ANY;
@@ -194,7 +194,7 @@ set_local(struct lustre_mount_data *lmd)
                 if (rc != 0) {
                         fprintf(stderr, "%s: can't read Elan ID from /proc\n",
                                 progname);
-                                
+
                         return -1;
                 }
         }
@@ -387,7 +387,11 @@ main(int argc, char * const argv[])
 
         rc = mount(source, target, "lustre", 0, (void *)&lmd);
         if (rc) {
+                rc = errno;
                 perror(argv[0]);
+                if (rc == ENODEV)
+                        fprintf(stderr, "Are the lustre modules loaded?\n"
+                             "Check /etc/modules.conf and /proc/filesystems\n");
         } else {
                 update_mtab_entry(source, target, "lustre", options, 0, 0, 0);
         }