Merge 3.17-rc3 into staging-next

[deliverable/linux.git] / drivers / staging / lustre / lustre / obdclass / class_obd.c

diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 701c6a77652496260a5aab7e92d93f6ae9e49b34..a73eb76b5327af6b4c974b908f5f450b48ae1593 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -208,7 +208,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
 
        /* only for debugging */
        if (cmd == LIBCFS_IOC_DEBUG_MASK) {
-               debug_data = (struct libcfs_debug_ioctl_data*)arg;
+               debug_data = (struct libcfs_debug_ioctl_data *)arg;
                libcfs_subsystem_debug = debug_data->subs;
                libcfs_debug = debug_data->debug;
                return 0;
@@ -381,7 +381,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                GOTO(out, err = -EINVAL);
        }
 
-       switch(cmd) {
+       switch (cmd) {
        case OBD_IOC_NO_TRANSNO: {
                if (!obd->obd_attached) {
                        CERROR("Device %d not attached\n", obd->obd_minor);