diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-04-13 09:03:19 +1000 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2018-04-12 20:32:50 -0500 |
| commit | 91cb74f5142c14dd921ab2d064b7b128054f9fae (patch) | |
| tree | 2b919132f80918392ddd2d518dade730a2d6d981 /fs/cifs/smb2pdu.c | |
| parent | e19b2bc0790a1c25b226815ce132c06274b1ba87 (diff) | |
| download | linux-0-day-91cb74f5142c14dd921ab2d064b7b128054f9fae.tar.gz linux-0-day-91cb74f5142c14dd921ab2d064b7b128054f9fae.tar.xz | |
cifs: Change SMB2_open to return an iov for the error parameter
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index be44c5c3e77ea..8a6921ef2ce19 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1807,7 +1807,7 @@ alloc_path_with_tree_prefix(__le16 **out_path, int *out_size, int *out_len, int SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, __u8 *oplock, struct smb2_file_all_info *buf, - struct smb2_err_rsp **err_buf) + struct kvec *err_iov) { struct smb2_create_req *req; struct smb2_create_rsp *rsp; @@ -1947,9 +1947,11 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, if (rc != 0) { cifs_stats_fail_inc(tcon, SMB2_CREATE_HE); - if (err_buf && rsp) - *err_buf = kmemdup(rsp, get_rfc1002_length(rsp) + 4, - GFP_KERNEL); + if (err_iov && rsp) { + *err_iov = rsp_iov; + resp_buftype = CIFS_NO_BUFFER; + rsp = NULL; + } goto creat_exit; } |