projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'perf_urgent_for_v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
fs
/
cifs
/
smb2misc.c
diff --git
a/fs/cifs/smb2misc.c
b/fs/cifs/smb2misc.c
index
60d4bd1
..
b50164e
100644
(file)
--- a/
fs/cifs/smb2misc.c
+++ b/
fs/cifs/smb2misc.c
@@
-767,7
+767,7
@@
smb2_cancelled_close_fid(struct work_struct *work)
int rc;
if (cancelled->mid)
int rc;
if (cancelled->mid)
- cifs_tcon_dbg(VFS, "Close unmatched open for MID:%ll
x
\n",
+ cifs_tcon_dbg(VFS, "Close unmatched open for MID:%ll
u
\n",
cancelled->mid);
else
cifs_tcon_dbg(VFS, "Close interrupted close\n");
cancelled->mid);
else
cifs_tcon_dbg(VFS, "Close interrupted close\n");
@@
-844,14
+844,14
@@
smb2_handle_cancelled_close(struct cifs_tcon *tcon, __u64 persistent_fid,
}
int
}
int
-smb2_handle_cancelled_mid(
char *buffer
, struct TCP_Server_Info *server)
+smb2_handle_cancelled_mid(
struct mid_q_entry *mid
, struct TCP_Server_Info *server)
{
{
- struct smb2_sync_hdr *sync_hdr =
(struct smb2_sync_hdr *)buffer
;
- struct smb2_create_rsp *rsp =
(struct smb2_create_rsp *)buffer
;
+ struct smb2_sync_hdr *sync_hdr =
mid->resp_buf
;
+ struct smb2_create_rsp *rsp =
mid->resp_buf
;
struct cifs_tcon *tcon;
int rc;
struct cifs_tcon *tcon;
int rc;
- if (sync_hdr->Command != SMB2_CREATE ||
+ if (
(mid->optype & CIFS_CP_CREATE_CLOSE_OP) ||
sync_hdr->Command != SMB2_CREATE ||
sync_hdr->Status != STATUS_SUCCESS)
return 0;
sync_hdr->Status != STATUS_SUCCESS)
return 0;