LU-6179 llite: remove LOCKAHEAD_OLD compatibility

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

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 1acd635..7ed149c 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -58,20 +58,6 @@
 #include "obdctl.h"
 #include "mount_utils.h"
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 10, 53, 0)
-/*
- * LU-1783
- * We only #include a kernel level include file here because
- * important MS_ flag #defines are missing from the SLES version
- * of sys/mount.h
- * In the future if SLES updates sys/mount.h to have a more complete
- * set of flag #defines we should stop including linux/fs.h
- */
-#if !defined(MS_RDONLY)
-#include <linux/fs.h>
-#endif
-#endif
-
 #ifdef HAVE_LIBMOUNT
 # define WITH_LIBMOUNT "(libmount)"
 #else
@@ -138,38 +124,38 @@ void usage(FILE *out)
 #define MAXNIDSTR 1024
 static char *convert_hostnames(char *s1)
 {
-        char *converted, *s2 = 0, *c;
-        char sep;
-        int left = MAXNIDSTR;
-        lnet_nid_t nid;
-
-        converted = malloc(left);
-        if (converted == NULL) {
-                fprintf(stderr, "out of memory: needed %d bytes\n",
-                        MAXNIDSTR);
-                return NULL;
-        }
-        c = converted;
-        while ((left > 0) && (*s1 != '/')) {
-                s2 = strpbrk(s1, ",:");
-                if (!s2)
-                        goto out_free;
-                sep = *s2;
-                *s2 = '\0';
-                nid = libcfs_str2nid(s1);
-                *s2 = sep;                      /* back to original string */
-                if (nid == LNET_NID_ANY)
-                        goto out_free;
-                c += snprintf(c, left, "%s%c", libcfs_nid2str(nid), sep);
-                left = converted + MAXNIDSTR - c;
-                s1 = s2 + 1;
-        }
-        snprintf(c, left, "%s", s1);
-        return converted;
+       char *converted, *s2 = 0, *c;
+       char sep;
+       int left = MAXNIDSTR;
+       lnet_nid_t nid;
+
+       converted = malloc(left);
+       if (converted == NULL) {
+               fprintf(stderr, "out of memory: needed %d bytes\n",
+                       MAXNIDSTR);
+               return NULL;
+       }
+       c = converted;
+       while ((left > 0) && (*s1 != '/')) {
+               s2 = strpbrk(s1, ",:");
+               if (!s2)
+                       goto out_free;
+               sep = *s2;
+               *s2 = '\0';
+               nid = libcfs_str2nid(s1);
+               *s2 = sep;                      /* back to original string */
+               if (nid == LNET_NID_ANY)
+                       goto out_free;
+               c += scnprintf(c, left, "%s%c", libcfs_nid2str(nid), sep);
+               left = converted + MAXNIDSTR - c;
+               s1 = s2 + 1;
+       }
+       snprintf(c, left, "%s", s1);
+       return converted;
 out_free:
-        fprintf(stderr, "%s: Can't parse NID '%s'\n", progname, s1);
-        free(converted);
-        return NULL;
+       fprintf(stderr, "%s: Can't parse NID '%s'\n", progname, s1);
+       free(converted);
+       return NULL;
 }
 
 /*****************************************************************************
@@ -348,7 +334,8 @@ int parse_options(struct mount_opts *mop, char *orig_options,
                                free(options);
                                return EINVAL;
                        }
-                       strncpy(mop->mo_skpath, val + 1, strlen(val + 1));
+                       strncpy(mop->mo_skpath, val + 1,
+                               sizeof(mop->mo_skpath) - 1);
 #endif
                } else if (parse_one_option(opt, flagp) == 0) {
                        /* pass this on as an option */