changed ioctl 'cmd' type from 'long' to 'int'

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 4ce3791..60e6198 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -202,7 +202,7 @@ struct obd_device {
 };
 
 struct obd_ops {
-        int (*o_iocontrol)(int cmd, struct obd_conn *, int len, void *karg,
+        int (*o_iocontrol)(long cmd, struct obd_conn *, int len, void *karg,
                            void *uarg);
         int (*o_get_info)(struct obd_conn *, obd_count keylen, void *key,
                           obd_count *vallen, void **val);

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 9bef050..9618a2a 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -285,7 +285,7 @@ out:
         return 0;
 }
 
-static int ldlm_iocontrol(int cmd, struct obd_conn *conn, int len, void *karg,
+static int ldlm_iocontrol(long cmd, struct obd_conn *conn, int len, void *karg,
                           void *uarg)
 {
         struct obd_device *obddev = conn->oc_dev;
@@ -295,7 +295,7 @@ static int ldlm_iocontrol(int cmd, struct obd_conn *conn, int len, void *karg,
 
         if (_IOC_TYPE(cmd) != IOC_LDLM_TYPE || _IOC_NR(cmd) < IOC_LDLM_MIN_NR ||
             _IOC_NR(cmd) > IOC_LDLM_MAX_NR) {
-                CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n",
+                CDEBUG(D_IOCTL, "invalid ioctl (type %ld, nr %ld, size %ld)\n",
                        _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd));
                 RETURN(-EINVAL);
         }

diff --git a/lustre/ptlrpc/rpc.c b/lustre/ptlrpc/rpc.c
index 862f6dc..f8a34aa 100644 (file)
--- a/lustre/ptlrpc/rpc.c
+++ b/lustre/ptlrpc/rpc.c
@@ -103,8 +103,8 @@ int connmgr_cleanup(struct obd_device *dev)
 }
 
 
-int connmgr_iocontrol(int cmd, struct obd_conn *conn, int len, void *karg,
-                         void *uarg)
+int connmgr_iocontrol(long cmd, struct obd_conn *conn, int len, void *karg,
+                      void *uarg)
 {
         struct recovd_obd *recovd = &conn->oc_dev->u.recovd;