LU-4423 lnet: fix deadloop in ksocknal_push

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

diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c
index abaa539..4cf35d1 100644 (file)
--- a/lustre/utils/lustre_lfsck.c
+++ b/lustre/utils/lustre_lfsck.c
@@ -41,9 +41,10 @@
 #include "obdctl.h"
 
 #include <lustre/lustre_lfsck_user.h>
-#include <libcfs/libcfsutil.h>
 #include <lnet/lnetctl.h>
 #include <lustre_ioctl.h>
+/* Needs to be last to avoid clashes */
+#include <libcfs/util/ioctl.h>
 
 static struct option long_opt_start[] = {
        {"device",              required_argument, 0, 'M'},
@@ -272,14 +273,11 @@ bad_type:
                }
                case 'w':
                        val = atoi(optarg);
-                       if (val < 0 || val > LFSCK_ASYNC_WIN_MAX) {
+                       if (val < 1 || val > LFSCK_ASYNC_WIN_MAX) {
                                fprintf(stderr,
-                                       "Too large async window size, "
-                                       "which may cause memory issues. "
-                                       "The valid range is [0 - %u]. "
-                                       "If you do not want to restrict "
-                                       "the window size for async reqeusts "
-                                       "pipeline, just set it as 0.\n",
+                                       "Invalid async window size that "
+                                       "may cause memory issues. The valid "
+                                       "range is [1 - %u].\n",
                                        LFSCK_ASYNC_WIN_MAX);
                                return -EINVAL;
                        }