leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CIFS: Move parsing lease buffer to ops struct

Browse Source 
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2013-09-05 20:16:45 +04:00 committed by Steve French
parent a41a28bda9
commit b5c7cde3fa
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifsglob.h
View File

@ -376,6 +376,8 @@ struct smb_version_operations {
void (*set_oplock_level)(struct cifsInodeInfo *, __u32); void (*set_oplock_level)(struct cifsInodeInfo *, __u32);
/* create lease context buffer for CREATE request */ /* create lease context buffer for CREATE request */
char * (*create_lease_buf)(u8 *, u8); char * (*create_lease_buf)(u8 *, u8);
/* parse lease context buffer and return oplock info */
__u8 (*parse_lease_buf)(void *);
}; };
struct smb_version_values { struct smb_version_values {

13
fs/cifs/smb2ops.c
View File

@ -748,6 +748,16 @@ smb2_create_lease_buf(u8 *lease_key, u8 oplock)
return (char *)buf; return (char *)buf;
} }
static __u8
smb2_parse_lease_buf(void *buf)
{
struct create_lease *lc = (struct create_lease *)buf;
if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS)
return SMB2_OPLOCK_LEVEL_NOCHANGE;
return le32_to_cpu(lc->lcontext.LeaseState);
}
struct smb_version_operations smb20_operations = { struct smb_version_operations smb20_operations = {
.compare_fids = smb2_compare_fids, .compare_fids = smb2_compare_fids,
.setup_request = smb2_setup_request, .setup_request = smb2_setup_request,
@ -816,6 +826,7 @@ struct smb_version_operations smb20_operations = {
.is_read_op = smb2_is_read_op, .is_read_op = smb2_is_read_op,
.set_oplock_level = smb2_set_oplock_level, .set_oplock_level = smb2_set_oplock_level,
.create_lease_buf = smb2_create_lease_buf, .create_lease_buf = smb2_create_lease_buf,
.parse_lease_buf = smb2_parse_lease_buf,
}; };
struct smb_version_operations smb21_operations = { struct smb_version_operations smb21_operations = {
@ -886,6 +897,7 @@ struct smb_version_operations smb21_operations = {
.is_read_op = smb21_is_read_op, .is_read_op = smb21_is_read_op,
.set_oplock_level = smb21_set_oplock_level, .set_oplock_level = smb21_set_oplock_level,
.create_lease_buf = smb2_create_lease_buf, .create_lease_buf = smb2_create_lease_buf,
.parse_lease_buf = smb2_parse_lease_buf,
}; };
struct smb_version_operations smb30_operations = { struct smb_version_operations smb30_operations = {
@ -958,6 +970,7 @@ struct smb_version_operations smb30_operations = {
.is_read_op = smb21_is_read_op, .is_read_op = smb21_is_read_op,
.set_oplock_level = smb21_set_oplock_level, .set_oplock_level = smb21_set_oplock_level,
.create_lease_buf = smb2_create_lease_buf, .create_lease_buf = smb2_create_lease_buf,
.parse_lease_buf = smb2_parse_lease_buf,
}; };
struct smb_version_values smb20_values = { struct smb_version_values smb20_values = {

27
fs/cifs/smb2pdu.c
View File

@ -903,34 +903,27 @@ create_reconnect_durable_buf(struct cifs_fid *fid)
} }
static __u8 static __u8
parse_lease_state(struct smb2_create_rsp *rsp) parse_lease_state(struct TCP_Server_Info *server, struct smb2_create_rsp *rsp)
{ {
char *data_offset; char *data_offset;
struct create_lease *lc; struct create_context *cc;
bool found = false;
unsigned int next = 0; unsigned int next = 0;
char *name; char *name;
data_offset = (char *)rsp + 4 + le32_to_cpu(rsp->CreateContextsOffset); data_offset = (char *)rsp + 4 + le32_to_cpu(rsp->CreateContextsOffset);
lc = (struct create_lease *)data_offset; cc = (struct create_context *)data_offset;
do { do {
lc = (struct create_lease *)((char *)lc + next); cc = (struct create_context *)((char *)cc + next);
name = le16_to_cpu(lc->ccontext.NameOffset) + (char *)lc; name = le16_to_cpu(cc->NameOffset) + (char *)cc;
if (le16_to_cpu(lc->ccontext.NameLength) != 4 || if (le16_to_cpu(cc->NameLength) != 4 ||
strncmp(name, "RqLs", 4)) { strncmp(name, "RqLs", 4)) {
next = le32_to_cpu(lc->ccontext.Next); next = le32_to_cpu(cc->Next);
continue; continue;
} }
if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS) return server->ops->parse_lease_buf(cc);
return SMB2_OPLOCK_LEVEL_NOCHANGE;
found = true;
break;
} while (next != 0); } while (next != 0);
if (!found) return 0;
return 0;
return le32_to_cpu(lc->lcontext.LeaseState);
} }
static int static int
@ -1109,7 +1102,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
} }
if (rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE) if (rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE)
*oplock = parse_lease_state(rsp); *oplock = parse_lease_state(server, rsp);
else else
*oplock = rsp->OplockLevel; *oplock = rsp->OplockLevel;
creat_exit: creat_exit: