I wanted to make the following trivial change to cifs's smb_sendv to
allow smb2 (the smb2 code treats the RFC1001 length as always big
endian, its native form, while cifs only converts it to bigendian at
the last possible moment) to use cifs's smb_sendv routine to put data
on the wire:
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 1a2930d..6085ac3 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -119,8 +119,7 @@ delete_mid(struct mid_q_entry *mid)
DeleteMidQEntry(mid);
}
-static int
-smb_sendv(struct TCP_Server_Info *server, struct kvec *iov, int n_vec)
+int smb_sendv(struct TCP_Server_Info *server, struct kvec *iov, int n_vec)
{
int rc = 0;
int i = 0;
@@ -154,7 +153,17 @@ smb_sendv(struct TCP_Server_Info *server, struct
kvec *iov, int n_vec)
for (i = 0; i < n_vec; i++)
total_len += iov[i].iov_len;
- smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length);
+ /* In SMB2 we treat the buffer length in its native form
+ (always be32 for RFC1001 length), but in all of the cifs
+ callers the equivalent, smb_buf_length, is treated
+ as host endian until right before we send it (here) so
+ has to be converted to big endian below. Would be
+ too big a change for cifspdu.c to change the many
+ dozen places that treat it as host endian for cifs, but
+ at least for smb2 we can treat it as host endian */
+ if (server->is_smb2 == false)
+ smb_buffer->smb_buf_length = (__force __u32)
+ cpu_to_be32(smb_buffer->smb_buf_length);
cFYI(1, "Sending smb: total_len %d", total_len);
dump_smb(smb_buffer, len);
Jeff prefers that we change cifs (a much larger change, hits about 100
places) to make:
u32 smb_buf_length;
instead (as it actually is on the wire)
_be32 smb_buf_length;
Basically this requires at least 50 changes like:
pSMB->hdr.smb_buf_length += byte_count;
to
pSMB->hdr.smb_buf_length =
cpu_to_be32(be32_to_cpu(pSMB->hdr.smb_buf_length) + byte_count);
(or an equivalent macro)
and about 40 other changes. This is marginally slower than the
current cifs approach, but is more accurate and intuitive in some
ways.
But before I do such a large cosmetic change to cifs (rather than the
simple one line change for smb2) - I want to give people a chance to
object.
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
