LU-13048 mdd: allow release after a non-blocking migrate

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

diff --git a/lustre/utils/liblustreapi_ioctl.c b/lustre/utils/liblustreapi_ioctl.c
index 183106c..296f3f9 100644 (file)
--- a/lustre/utils/liblustreapi_ioctl.c
+++ b/lustre/utils/liblustreapi_ioctl.c
@@ -40,8 +40,10 @@
 #include <lustre/lustreapi.h>
 #include <libcfs/util/ioctl.h>
 #include <linux/lustre/lustre_ioctl.h>
-#include <lustre_ioctl_old.h>
 #include <linux/lustre/lustre_ver.h>
+#include <lustre_ioctl_old.h>
+
+#include "lustreapi_internal.h"
 
 int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
 {
@@ -99,7 +101,7 @@ int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
  * \param cmd          ioctl command
  * \param buf          ioctl data argument, usually obd_ioctl_data
  */
-int llapi_ioctl_dev(unsigned int dev_id, unsigned int cmd, void *buf)
+int llapi_ioctl_dev(int dev_id, unsigned int cmd, void *buf)
 {
        unsigned int oldcmd;
        int rc;
@@ -165,7 +167,7 @@ int llapi_ioctl(int fd, unsigned int cmd, void *buf)
         * Version in comment is to allow finding this code for later removal.
         */
 #ifdef OBD_IOC_GETNAME_OLD     /* < OBD_OCD_VERSION(2, 18, 53, 0) */
-       case OBD_IOC_GETMDNAME:
+       case OBD_IOC_GETDTNAME:
                oldcmd = OBD_IOC_GETNAME_OLD;
                break;
 #endif