LU-3950 lfsck: control all LFSCK nodes via single command (2)

[fs/lustre-release.git] / lustre / ofd / ofd_obd.c

diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index a5e7a2d..e3491db 100644 (file)
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -1023,7 +1023,6 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                        break;
                }
 
-               lsp.lsp_namespace = ofd->ofd_namespace;
                lsp.lsp_start = (struct lfsck_start *)(data->ioc_inlbuf1);
                lsp.lsp_index_valid = 0;
                rc = lfsck_start(&env, ofd->ofd_osd, &lsp);
@@ -1031,9 +1030,17 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
        }
        case OBD_IOC_STOP_LFSCK: {
                struct obd_ioctl_data *data = karg;
+               struct lfsck_stop      stop;
 
-               rc = lfsck_stop(&env, ofd->ofd_osd,
-                               (struct lfsck_stop *)(data->ioc_inlbuf1));
+               stop.ls_status = LS_STOPPED;
+               /* Old lfsck utils may pass NULL @stop. */
+               if (data->ioc_inlbuf1 == NULL)
+                       stop.ls_flags = 0;
+               else
+                       stop.ls_flags =
+                       ((struct lfsck_stop *)(data->ioc_inlbuf1))->ls_flags;
+
+               rc = lfsck_stop(&env, ofd->ofd_osd, &stop);
                break;
        }
        case OBD_IOC_GET_OBJ_VERSION: