b=22544 delete module_setup.sh

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

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index ceb1436..8130da8 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -494,7 +494,12 @@ set_params:
 int main(int argc, char *const argv[])
 {
         char default_options[] = "";
-        char *usource, *source, *target, *ptr;
+        char *usource, *source, *ptr;
+        char target[PATH_MAX] = {'\0'};
+        char real_path[PATH_MAX] = {'\0'};
+        char path[256], name[256];
+        FILE *f;
+        size_t sz;
         char *options, *optcopy, *orig_options = default_options;
         int i, nargs = 3, opt, rc, flags, optlen;
         static struct option long_opt[] = {
@@ -557,16 +562,37 @@ int main(int argc, char *const argv[])
                 usage(stderr);
         }
 
+        /**
+         * Try to get the real path to the device, in case it is a
+         * symbolic link for instance
+         */
+        if (realpath(usource, real_path) != NULL) {
+                usource = real_path;
+
+                ptr = strrchr(real_path, '/');
+                if (ptr && strncmp(ptr, "/dm-", 4) == 0 && isdigit(*(ptr + 4))) {
+                        snprintf(path, sizeof(path), "/sys/block/%s/dm/name", ptr+1);
+                        if ((f = fopen(path, "r"))) {
+                                /* read "<name>\n" from sysfs */
+                                if (fgets(name, sizeof(name), f) && (sz = strlen(name)) > 1) {
+                                        name[sz - 1] = '\0';
+                                        snprintf(real_path, sizeof(real_path), "/dev/mapper/%s", name);
+                                }
+                                fclose(f);
+                        }
+                }
+        }
+
         source = convert_hostnames(usource);
         if (!source) {
                 usage(stderr);
         }
 
-        target = argv[optind + 1];
-        ptr = target + strlen(target) - 1;
-        while ((ptr > target) && (*ptr == '/')) {
-                *ptr = 0;
-                ptr--;
+        if (realpath(argv[optind + 1], target) == NULL) {
+                rc = errno;
+                fprintf(stderr, "warning: %s: cannot resolve: %s\n",
+                        argv[optind + 1], strerror(errno));
+                return rc;
         }
 
         if (verbose) {