lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CIFS: Simplify SMB2_open code path

Browse Source 
by passing a filename to a separate iovec regardless of its length.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steven French <steven@steven-GA-970A-DS3.(none)>
This commit is contained in:
Pavel Shilovsky
2013-07-04 19:41:24 +04:00
committed by Steve French
parent ca81983fe5
commit 59aa371841
2 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
fs/cifs/smb2pdu.c
View File

@@ -894,7 +894,7 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
__le16 *copy_path = NULL; __le16 *copy_path = NULL;
int copy_size; int copy_size;
int rc = 0; int rc = 0;
int num_iovecs = 2; unsigned int num_iovecs = 2;
__u32 file_attributes = 0; __u32 file_attributes = 0;
cifs_dbg(FYI, "create/open\n"); cifs_dbg(FYI, "create/open\n");
@@ -919,47 +919,36 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
req->CreateDisposition = cpu_to_le32(create_disposition); req->CreateDisposition = cpu_to_le32(create_disposition);
req->CreateOptions = cpu_to_le32(create_options & CREATE_OPTIONS_MASK); req->CreateOptions = cpu_to_le32(create_options & CREATE_OPTIONS_MASK);
uni_path_len = (2 * UniStrnlen((wchar_t *)path, PATH_MAX)) + 2; uni_path_len = (2 * UniStrnlen((wchar_t *)path, PATH_MAX)) + 2;
req->NameOffset = cpu_to_le16(sizeof(struct smb2_create_req) /* do not count rfc1001 len field */
- 8 /* pad */ - 4 /* do not count rfc1001 len field */); req->NameOffset = cpu_to_le16(sizeof(struct smb2_create_req) - 4);
iov[0].iov_base = (char *)req; iov[0].iov_base = (char *)req;
/* 4 for rfc1002 length field */ /* 4 for rfc1002 length field */
iov[0].iov_len = get_rfc1002_length(req) + 4; iov[0].iov_len = get_rfc1002_length(req) + 4;
/* MUST set path len (NameLength) to 0 opening root of share */ /* MUST set path len (NameLength) to 0 opening root of share */
if (uni_path_len >= 4) { req->NameLength = cpu_to_le16(uni_path_len - 2);
req->NameLength = cpu_to_le16(uni_path_len - 2); /* -1 since last byte is buf[0] which is sent below (path) */
/* -1 since last byte is buf[0] which is sent below (path) */ iov[0].iov_len--;
iov[0].iov_len--; if (uni_path_len % 8 != 0) {
if (uni_path_len % 8 != 0) { copy_size = uni_path_len / 8 * 8;
copy_size = uni_path_len / 8 * 8; if (copy_size < uni_path_len)
if (copy_size < uni_path_len) copy_size += 8;
copy_size += 8;
copy_path = kzalloc(copy_size, GFP_KERNEL); copy_path = kzalloc(copy_size, GFP_KERNEL);
if (!copy_path) if (!copy_path)
return -ENOMEM; return -ENOMEM;
memcpy((char *)copy_path, (const char *)path, memcpy((char *)copy_path, (const char *)path,
uni_path_len); uni_path_len);
uni_path_len = copy_size; uni_path_len = copy_size;
path = copy_path; path = copy_path;
}
iov[1].iov_len = uni_path_len;
iov[1].iov_base = path;
/*
* -1 since last byte is buf[0] which was counted in
* smb2_buf_len.
*/
inc_rfc1001_len(req, uni_path_len - 1);
} else {
iov[0].iov_len += 7;
req->hdr.smb2_buf_length = cpu_to_be32(be32_to_cpu(
req->hdr.smb2_buf_length) + 8 - 1);
num_iovecs = 1;
req->NameLength = 0;
} }
iov[1].iov_len = uni_path_len;
iov[1].iov_base = path;
/* -1 since last byte is buf[0] which was counted in smb2_buf_len */
inc_rfc1001_len(req, uni_path_len - 1);
if (!server->oplocks) if (!server->oplocks)
*oplock = SMB2_OPLOCK_LEVEL_NONE; *oplock = SMB2_OPLOCK_LEVEL_NONE;
@@ -976,7 +965,7 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
iov[num_iovecs].iov_len = sizeof(struct create_lease); iov[num_iovecs].iov_len = sizeof(struct create_lease);
req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_LEASE; req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_LEASE;
req->CreateContextsOffset = cpu_to_le32( req->CreateContextsOffset = cpu_to_le32(
sizeof(struct smb2_create_req) - 4 - 8 + sizeof(struct smb2_create_req) - 4 +
iov[num_iovecs-1].iov_len); iov[num_iovecs-1].iov_len);
req->CreateContextsLength = cpu_to_le32( req->CreateContextsLength = cpu_to_le32(
sizeof(struct create_lease)); sizeof(struct create_lease));

2
fs/cifs/smb2pdu.h
View File

@@ -428,7 +428,7 @@ struct smb2_create_req {
__le16 NameLength; __le16 NameLength;
__le32 CreateContextsOffset; __le32 CreateContextsOffset;
__le32 CreateContextsLength; __le32 CreateContextsLength;
__u8 Buffer[8]; __u8 Buffer[0];
} __packed; } __packed;
struct smb2_create_rsp { struct smb2_create_rsp {