[linux-cifs-client] [PATCH 6/7] [CIFS] rename setup_ucs_nls_name
and add wrapper with original name
Jeff Layton
jlayton at redhat.com
Fri Jul 25 15:23:20 GMT 2008
Rename setup_ucs_nls_name to __setup_ucs_nls_name, and add a wrapper
function with the original name that takes a cifs_sb arg instead of a
nls_codepage and a remap flag.
This will allow us to change the args on the functions that call these
one-by-one.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
---
fs/cifs/cifssmb.c | 55 +++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5971549..6c84029 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -446,7 +446,7 @@ static int validate_t2(struct smb_t2_rsp *pSMB)
}
static int
-setup_ucs_nls_name(__le16 Flags2, char *dst, const char *src,
+__setup_ucs_nls_name(__le16 Flags2, char *dst, const char *src,
const struct nls_table *nls_codepage, int remap)
{
int name_len;
@@ -465,6 +465,15 @@ setup_ucs_nls_name(__le16 Flags2, char *dst, const char *src,
return name_len;
}
+static int
+setup_ucs_nls_name(__le16 Flags2, char *dst, const char *src,
+ const struct cifs_sb_info *cifs_sb)
+{
+ return __setup_ucs_nls_name(Flags2, dst, src, cifs_sb->local_nls,
+ cifs_sb->mnt_cifs_flags &
+ CIFS_MOUNT_MAP_SPECIAL_CHR);
+}
+
int
CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
{
@@ -884,7 +893,7 @@ PsxDelete:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
@@ -947,7 +956,7 @@ DelFileRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->fileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->fileName,
fileName, nls_codepage, remap);
pSMB->SearchAttributes =
@@ -985,7 +994,7 @@ RmDirRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->DirName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->DirName,
dirName, nls_codepage, remap);
pSMB->BufferFormat = 0x04;
@@ -1020,7 +1029,7 @@ MkDirRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->DirName, name,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->DirName, name,
nls_codepage, remap);
pSMB->BufferFormat = 0x04;
@@ -1060,7 +1069,7 @@ PsxCreat:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName, name,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName, name,
nls_codepage, remap);
params = 6 + name_len;
count = sizeof(OPEN_PSX_REQ);
@@ -2163,7 +2172,7 @@ createSymLinkRetry:
if (rc)
return rc;
/* pass remap = 0 */
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fromName, nls_codepage, 0);
params = 6 + name_len;
pSMB->MaxSetupCount = 0;
@@ -2178,7 +2187,7 @@ createSymLinkRetry:
data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
/* pass remap = 0 */
- name_len_target = setup_ucs_nls_name(pSMB->hdr.Flags2, data_offset,
+ name_len_target = __setup_ucs_nls_name(pSMB->hdr.Flags2, data_offset,
toName, nls_codepage, 0);
pSMB->MaxParameterCount = cpu_to_le16(2);
/* BB find exact max on data count below from sess */
@@ -2232,7 +2241,7 @@ createHardLinkRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName, toName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName, toName,
nls_codepage, remap);
params = 6 + name_len;
pSMB->MaxSetupCount = 0;
@@ -2245,7 +2254,7 @@ createHardLinkRetry:
offset = param_offset + params;
data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
- name_len_target = setup_ucs_nls_name(pSMB->hdr.Flags2, data_offset,
+ name_len_target = __setup_ucs_nls_name(pSMB->hdr.Flags2, data_offset,
fromName, nls_codepage, remap);
pSMB->MaxParameterCount = cpu_to_le16(2);
/* BB find exact max on data count below from sess*/
@@ -2370,7 +2379,7 @@ querySymLinkRetry:
return rc;
/* pass remap = 0 */
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, 0);
params = 2 /* level */ + 4 /* rsrvd */ + name_len /* incl null */ ;
pSMB->TotalDataCount = 0;
@@ -2879,7 +2888,7 @@ setAclRetry:
(void **) &pSMBr);
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -3192,7 +3201,7 @@ QInfRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
pSMB->BufferFormat = 0x04;
name_len++; /* account for buffer type byte */
@@ -3257,7 +3266,7 @@ QPathInfoRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
pSMB->TotalDataCount = 0;
@@ -3347,7 +3356,7 @@ UnixQPathInfoRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
pSMB->TotalDataCount = 0;
@@ -3717,7 +3726,7 @@ GetInodeNumberRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
params = 2 /* level */ + 4 /* rsrvd */ + name_len /* incl null */ ;
pSMB->TotalDataCount = 0;
@@ -3910,7 +3919,7 @@ getDFSRetry:
if (ses->capabilities & CAP_UNICODE)
pSMB->hdr.Flags2 |= SMBFLG2_UNICODE;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->RequestFileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->RequestFileName,
searchName, nls_codepage, remap);
if (ses->server) {
if (ses->server->secMode &
@@ -4533,7 +4542,7 @@ SetEOFRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
data_count = sizeof(struct file_end_of_file_info);
@@ -4764,7 +4773,7 @@ SetTimesRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
count = sizeof(FILE_BASIC_INFO);
@@ -4885,7 +4894,7 @@ setPermsRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
count = sizeof(FILE_UNIX_BASIC_INFO);
@@ -5058,7 +5067,7 @@ QAllEAsRetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
pSMB->TotalDataCount = 0;
@@ -5196,7 +5205,7 @@ QEARetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
searchName, nls_codepage, remap);
params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
pSMB->TotalDataCount = 0;
@@ -5335,7 +5344,7 @@ SetEARetry:
if (rc)
return rc;
- name_len = setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
+ name_len = __setup_ucs_nls_name(pSMB->hdr.Flags2, pSMB->FileName,
fileName, nls_codepage, remap);
params = 6 + name_len;
More information about the linux-cifs-client
mailing list