kernel: Adjust some indentation.
authorSascha Wildner <saw@online.de>
Tue, 1 May 2012 12:21:57 +0000 (14:21 +0200)
committerSascha Wildner <saw@online.de>
Tue, 1 May 2012 12:21:57 +0000 (14:21 +0200)
sys/dev/raid/twa/tw_cl_misc.c
sys/netinet/tcp_input.c
sys/vfs/nfs/nfs_socket.c

index 798e38a..e7ea090 100644 (file)
@@ -742,14 +742,16 @@ tw_cli_check_ctlr_state(struct tw_cli_ctlr_context *ctlr, TW_UINT32 status_reg)
                     (ctlr->device_id != TW_CL_DEVICE_ID_9K_SA)) ||
                    (!(ctlr->reset_in_progress)) ||
                    ((status_reg & TWA_STATUS_QUEUE_ERROR_INTERRUPT) == 0))
-               tw_cl_create_event(ctlr_handle, TW_CL_FALSE,
-                       TW_CL_MESSAGE_SOURCE_COMMON_LAYER_EVENT,
-                       0x1302, 0x1, TW_CL_SEVERITY_ERROR_STRING,
-                       "Unexpected status bit(s)",
-                       "status reg = 0x%x Unexpected bits: %s",
-                       status_reg & TWA_STATUS_UNEXPECTED_BITS,
-                       tw_cli_describe_bits(status_reg &
-                               TWA_STATUS_UNEXPECTED_BITS, desc));
+               {
+                       tw_cl_create_event(ctlr_handle, TW_CL_FALSE,
+                           TW_CL_MESSAGE_SOURCE_COMMON_LAYER_EVENT,
+                           0x1302, 0x1, TW_CL_SEVERITY_ERROR_STRING,
+                           "Unexpected status bit(s)",
+                           "status reg = 0x%x Unexpected bits: %s",
+                           status_reg & TWA_STATUS_UNEXPECTED_BITS,
+                           tw_cli_describe_bits(status_reg &
+                                   TWA_STATUS_UNEXPECTED_BITS, desc));
+               }
 
                if (status_reg & TWA_STATUS_PCI_PARITY_ERROR_INTERRUPT) {
                        tw_cl_create_event(ctlr_handle, TW_CL_FALSE,
index c8e5192..53624d5 100644 (file)
@@ -3027,11 +3027,11 @@ tcp_mss(struct tcpcb *tp, int offer)
                mss -= TCPOLEN_TSTAMP_APPA;
 
 #if    (MCLBYTES & (MCLBYTES - 1)) == 0
-               if (mss > MCLBYTES)
-                       mss &= ~(MCLBYTES-1);
+       if (mss > MCLBYTES)
+               mss &= ~(MCLBYTES-1);
 #else
-               if (mss > MCLBYTES)
-                       mss = mss / MCLBYTES * MCLBYTES;
+       if (mss > MCLBYTES)
+               mss = mss / MCLBYTES * MCLBYTES;
 #endif
        /*
         * If there's a pipesize, change the socket buffer
index 0a04eee..9aece31 100644 (file)
@@ -627,12 +627,13 @@ tryagain:
                            /*
                             * Only log short packets if not EOF
                             */
-                           if (auio.uio_resid != sizeof(u_int32_t))
-                           log(LOG_INFO,
-                                "short receive (%d/%d) from nfs server %s\n",
-                                (int)(sizeof(u_int32_t) - auio.uio_resid),
-                                (int)sizeof(u_int32_t),
-                                nmp->nm_mountp->mnt_stat.f_mntfromname);
+                           if (auio.uio_resid != sizeof(u_int32_t)) {
+                               log(LOG_INFO,
+                                   "short receive (%d/%d) from nfs server %s\n",
+                                   (int)(sizeof(u_int32_t) - auio.uio_resid),
+                                   (int)sizeof(u_int32_t),
+                                   nmp->nm_mountp->mnt_stat.f_mntfromname);
+                           }
                            error = EPIPE;
                        }
                        if (error)
@@ -662,11 +663,12 @@ tryagain:
                        } while (error == EWOULDBLOCK || error == EINTR ||
                                 error == ERESTART);
                        if (error == 0 && sio.sb_cc != len) {
-                           if (sio.sb_cc != 0)
-                           log(LOG_INFO,
-                               "short receive (%zu/%d) from nfs server %s\n",
-                               (size_t)len - auio.uio_resid, len,
-                               nmp->nm_mountp->mnt_stat.f_mntfromname);
+                           if (sio.sb_cc != 0) {
+                               log(LOG_INFO,
+                                   "short receive (%zu/%d) from nfs server %s\n",
+                                   (size_t)len - auio.uio_resid, len,
+                                   nmp->nm_mountp->mnt_stat.f_mntfromname);
+                           }
                            error = EPIPE;
                        }
                        *mp = sio.sb_mb;