Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326319
b: refs/heads/master
c: 12e8a20
h: refs/heads/master
i:
  326317: 50d35eb
  326315: fcf7dbf
  326311: 015e6c1
  326303: a93d24d
v: v3
  • Loading branch information
Steve French committed Sep 25, 2012
1 parent 7c34383 commit 0e0c415
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba02e89915afcfc9a071a86e5cae32f77c7d353a
refs/heads/master: 12e8a20824677fbc24e921d7aebfda6a47cc25b1
5 changes: 3 additions & 2 deletions trunk/fs/cifs/smb2misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,8 @@ smb2_is_valid_lease_break(char *buffer, struct TCP_Server_Info *server)
struct cifs_pending_open *open;
struct smb2_lease_break_work *lw;
bool found;
int ack_req = rsp->Flags & SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED;
int ack_req = le32_to_cpu(rsp->Flags &
SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED);

lw = kmalloc(sizeof(struct smb2_lease_break_work), GFP_KERNEL);
if (!lw) {
Expand Down Expand Up @@ -524,7 +525,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
if (rsp->hdr.Command != SMB2_OPLOCK_BREAK)
return false;

if (le16_to_cpu(rsp->StructureSize) !=
if (rsp->StructureSize !=
smb2_rsp_struct_sizes[SMB2_OPLOCK_BREAK_HE]) {
if (le16_to_cpu(rsp->StructureSize) == 44)
return smb2_is_valid_lease_break(buffer, server);
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/cifs/smb2ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ smb2_is_status_pending(char *buf, struct TCP_Server_Info *server, int length)
{
struct smb2_hdr *hdr = (struct smb2_hdr *)buf;

if (le32_to_cpu(hdr->Status) != STATUS_PENDING)
if (hdr->Status != STATUS_PENDING)
return false;

if (!length) {
Expand Down

0 comments on commit 0e0c415

Please sign in to comment.