tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

smb3: rename encryption_required to smb3_encryption_required

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

authored by

Steve French and committed by
Steve French 5a77e75f 3fa9a540

+21 -21
+21 -21
fs/cifs/smb2pdu.c
··· 79 79 /* SMB2_OPLOCK_BREAK */ 24 /* BB this is 36 for LEASE_BREAK variant */ 80 80 }; 81 81 82 - static int encryption_required(const struct cifs_tcon *tcon) 82 + static int smb3_encryption_required(const struct cifs_tcon *tcon) 83 83 { 84 84 if (!tcon) 85 85 return 0; ··· 145 145 shdr->Flags |= SMB2_FLAGS_DFS_OPERATIONS; */ 146 146 147 147 if (tcon->ses && tcon->ses->server && tcon->ses->server->sign && 148 - !encryption_required(tcon)) 148 + !smb3_encryption_required(tcon)) 149 149 shdr->Flags |= SMB2_FLAGS_SIGNED; 150 150 out: 151 151 return; ··· 1403 1403 return rc; 1404 1404 } 1405 1405 1406 - if (encryption_required(tcon)) 1406 + if (smb3_encryption_required(tcon)) 1407 1407 flags |= CIFS_TRANSFORM_REQ; 1408 1408 1409 1409 iov[0].iov_base = (char *)req; ··· 1419 1419 1420 1420 /* 3.11 tcon req must be signed if not encrypted. See MS-SMB2 3.2.4.1.1 */ 1421 1421 if ((ses->server->dialect == SMB311_PROT_ID) && 1422 - !encryption_required(tcon)) 1422 + !smb3_encryption_required(tcon)) 1423 1423 req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED; 1424 1424 1425 1425 rc = smb2_send_recv(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov); ··· 1508 1508 if (rc) 1509 1509 return rc; 1510 1510 1511 - if (encryption_required(tcon)) 1511 + if (smb3_encryption_required(tcon)) 1512 1512 flags |= CIFS_TRANSFORM_REQ; 1513 1513 1514 1514 flags |= CIFS_NO_RESP; ··· 1844 1844 if (rc) 1845 1845 return rc; 1846 1846 1847 - if (encryption_required(tcon)) 1847 + if (smb3_encryption_required(tcon)) 1848 1848 flags |= CIFS_TRANSFORM_REQ; 1849 1849 1850 1850 if (oparms->create_options & CREATE_OPTION_READONLY) ··· 2027 2027 if (rc) 2028 2028 return rc; 2029 2029 2030 - if (encryption_required(tcon)) 2030 + if (smb3_encryption_required(tcon)) 2031 2031 flags |= CIFS_TRANSFORM_REQ; 2032 2032 2033 2033 req->CtlCode = cpu_to_le32(opcode); ··· 2185 2185 if (rc) 2186 2186 return rc; 2187 2187 2188 - if (encryption_required(tcon)) 2188 + if (smb3_encryption_required(tcon)) 2189 2189 flags |= CIFS_TRANSFORM_REQ; 2190 2190 2191 2191 req->PersistentFileId = persistent_fid; ··· 2300 2300 if (rc) 2301 2301 return rc; 2302 2302 2303 - if (encryption_required(tcon)) 2303 + if (smb3_encryption_required(tcon)) 2304 2304 flags |= CIFS_TRANSFORM_REQ; 2305 2305 2306 2306 req->InfoType = info_type; ··· 2544 2544 if (rc) 2545 2545 return rc; 2546 2546 2547 - if (encryption_required(tcon)) 2547 + if (smb3_encryption_required(tcon)) 2548 2548 flags |= CIFS_TRANSFORM_REQ; 2549 2549 2550 2550 req->PersistentFileId = persistent_fid; ··· 2768 2768 return rc; 2769 2769 } 2770 2770 2771 - if (encryption_required(io_parms.tcon)) 2771 + if (smb3_encryption_required(io_parms.tcon)) 2772 2772 flags |= CIFS_TRANSFORM_REQ; 2773 2773 2774 2774 req_len = cpu_to_be32(total_len); ··· 2824 2824 if (rc) 2825 2825 return rc; 2826 2826 2827 - if (encryption_required(io_parms->tcon)) 2827 + if (smb3_encryption_required(io_parms->tcon)) 2828 2828 flags |= CIFS_TRANSFORM_REQ; 2829 2829 2830 2830 iov[0].iov_base = (char *)req; ··· 2960 2960 goto async_writev_out; 2961 2961 } 2962 2962 2963 - if (encryption_required(tcon)) 2963 + if (smb3_encryption_required(tcon)) 2964 2964 flags |= CIFS_TRANSFORM_REQ; 2965 2965 2966 2966 shdr = (struct smb2_sync_hdr *)req; ··· 3098 3098 if (io_parms->tcon->ses->server == NULL) 3099 3099 return -ECONNABORTED; 3100 3100 3101 - if (encryption_required(io_parms->tcon)) 3101 + if (smb3_encryption_required(io_parms->tcon)) 3102 3102 flags |= CIFS_TRANSFORM_REQ; 3103 3103 3104 3104 req->sync_hdr.ProcessId = cpu_to_le32(io_parms->pid); ··· 3208 3208 if (rc) 3209 3209 return rc; 3210 3210 3211 - if (encryption_required(tcon)) 3211 + if (smb3_encryption_required(tcon)) 3212 3212 flags |= CIFS_TRANSFORM_REQ; 3213 3213 3214 3214 switch (srch_inf->info_level) { ··· 3341 3341 return rc; 3342 3342 } 3343 3343 3344 - if (encryption_required(tcon)) 3344 + if (smb3_encryption_required(tcon)) 3345 3345 flags |= CIFS_TRANSFORM_REQ; 3346 3346 3347 3347 req->sync_hdr.ProcessId = cpu_to_le32(pid); ··· 3536 3536 if (rc) 3537 3537 return rc; 3538 3538 3539 - if (encryption_required(tcon)) 3539 + if (smb3_encryption_required(tcon)) 3540 3540 flags |= CIFS_TRANSFORM_REQ; 3541 3541 3542 3542 req->VolatileFid = volatile_fid; ··· 3628 3628 if (rc) 3629 3629 return rc; 3630 3630 3631 - if (encryption_required(tcon)) 3631 + if (smb3_encryption_required(tcon)) 3632 3632 flags |= CIFS_TRANSFORM_REQ; 3633 3633 3634 3634 rc = smb2_send_recv(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov); ··· 3686 3686 if (rc) 3687 3687 return rc; 3688 3688 3689 - if (encryption_required(tcon)) 3689 + if (smb3_encryption_required(tcon)) 3690 3690 flags |= CIFS_TRANSFORM_REQ; 3691 3691 3692 3692 rc = smb2_send_recv(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov); ··· 3743 3743 if (rc) 3744 3744 return rc; 3745 3745 3746 - if (encryption_required(tcon)) 3746 + if (smb3_encryption_required(tcon)) 3747 3747 flags |= CIFS_TRANSFORM_REQ; 3748 3748 3749 3749 req->sync_hdr.ProcessId = cpu_to_le32(pid); ··· 3807 3807 if (rc) 3808 3808 return rc; 3809 3809 3810 - if (encryption_required(tcon)) 3810 + if (smb3_encryption_required(tcon)) 3811 3811 flags |= CIFS_TRANSFORM_REQ; 3812 3812 3813 3813 req->sync_hdr.CreditRequest = cpu_to_le16(1);