Revert "PCI: armada8k: Add support for gpio controlled reset signal"

[sfrench/cifs-2.6.git] / fs / cifs / transport.c

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index f8112433f0c8b3fa90911bc8451b631a5b9b1ef8..5be7302853b6c55fe97b04339c39fd4d13567db6 100644 (file)
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -126,9 +126,11 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
        if ((slow_rsp_threshold != 0) &&
            time_after(now, midEntry->when_alloc + (slow_rsp_threshold * HZ)) &&
            (midEntry->command != command)) {
-               /* smb2slowcmd[NUMBER_OF_SMB2_COMMANDS] counts by command */
-               if ((le16_to_cpu(midEntry->command) < NUMBER_OF_SMB2_COMMANDS) &&
-                   (le16_to_cpu(midEntry->command) >= 0))
+               /*
+                * smb2slowcmd[NUMBER_OF_SMB2_COMMANDS] counts by command
+                * NB: le16_to_cpu returns unsigned so can not be negative below
+                */
+               if (le16_to_cpu(midEntry->command) < NUMBER_OF_SMB2_COMMANDS)
                        cifs_stats_inc(&midEntry->server->smb2slowcmd[le16_to_cpu(midEntry->command)]);
 
                trace_smb3_slow_rsp(le16_to_cpu(midEntry->command),
@@ -316,8 +318,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
                        .iov_base = &rfc1002_marker,
                        .iov_len  = 4
                };
-               iov_iter_kvec(&smb_msg.msg_iter, WRITE | ITER_KVEC, &hiov,
-                             1, 4);
+               iov_iter_kvec(&smb_msg.msg_iter, WRITE, &hiov, 1, 4);
                rc = smb_send_kvec(server, &smb_msg, &sent);
                if (rc < 0)
                        goto uncork;
@@ -338,8 +339,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
                        size += iov[i].iov_len;
                }
 
-               iov_iter_kvec(&smb_msg.msg_iter, WRITE | ITER_KVEC,
-                             iov, n_vec, size);
+               iov_iter_kvec(&smb_msg.msg_iter, WRITE, iov, n_vec, size);
 
                rc = smb_send_kvec(server, &smb_msg, &sent);
                if (rc < 0)
@@ -355,7 +355,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
                        rqst_page_get_length(&rqst[j], i, &bvec.bv_len,
                                             &bvec.bv_offset);
 
-                       iov_iter_bvec(&smb_msg.msg_iter, WRITE | ITER_BVEC,
+                       iov_iter_bvec(&smb_msg.msg_iter, WRITE,
                                      &bvec, 1, bvec.bv_len);
                        rc = smb_send_kvec(server, &smb_msg, &sent);
                        if (rc < 0)