提交 88274815 编写于 作者: S Steve French

[CIFS] Fix two remaining coverity scan tool warnings.

Signed-off-by: NSteve French <sfrench@us.ibm.com>
上级 f6e77c94
...@@ -3061,7 +3061,8 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, ...@@ -3061,7 +3061,8 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon,
pSMB->TotalParameterCount = cpu_to_le16(params); pSMB->TotalParameterCount = cpu_to_le16(params);
pSMB->ParameterCount = pSMB->TotalParameterCount; pSMB->ParameterCount = pSMB->TotalParameterCount;
pSMB->ParameterOffset = cpu_to_le16( pSMB->ParameterOffset = cpu_to_le16(
offsetof(struct smb_com_transaction2_ffirst_req, SearchAttributes) - 4); offsetof(struct smb_com_transaction2_ffirst_req, SearchAttributes)
- 4);
pSMB->DataCount = 0; pSMB->DataCount = 0;
pSMB->DataOffset = 0; pSMB->DataOffset = 0;
pSMB->SetupCount = 1; /* one byte, no need to make endian neutral */ pSMB->SetupCount = 1; /* one byte, no need to make endian neutral */
...@@ -3084,12 +3085,12 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, ...@@ -3084,12 +3085,12 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon,
(struct smb_hdr *) pSMBr, &bytes_returned, 0); (struct smb_hdr *) pSMBr, &bytes_returned, 0);
cifs_stats_inc(&tcon->num_ffirst); cifs_stats_inc(&tcon->num_ffirst);
if (rc) {/* BB add logic to retry regular search if Unix search rejected unexpectedly by server */ if (rc) {/* BB add logic to retry regular search if Unix search
rejected unexpectedly by server */
/* BB Add code to handle unsupported level rc */ /* BB Add code to handle unsupported level rc */
cFYI(1, ("Error in FindFirst = %d", rc)); cFYI(1, ("Error in FindFirst = %d", rc));
if (pSMB) cifs_buf_release(pSMB);
cifs_buf_release(pSMB);
/* BB eventually could optimize out free and realloc of buf */ /* BB eventually could optimize out free and realloc of buf */
/* for this case */ /* for this case */
......
...@@ -48,13 +48,14 @@ build_path_from_dentry(struct dentry *direntry) ...@@ -48,13 +48,14 @@ build_path_from_dentry(struct dentry *direntry)
struct dentry *temp; struct dentry *temp;
int namelen = 0; int namelen = 0;
char *full_path; char *full_path;
char dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb)); char dirsep;
if(direntry == NULL) if(direntry == NULL)
return NULL; /* not much we can do if dentry is freed and return NULL; /* not much we can do if dentry is freed and
we need to reopen the file after it was closed implicitly we need to reopen the file after it was closed implicitly
when the server crashed */ when the server crashed */
dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb));
cifs_bp_rename_retry: cifs_bp_rename_retry:
for (temp = direntry; !IS_ROOT(temp);) { for (temp = direntry; !IS_ROOT(temp);) {
namelen += (1 + temp->d_name.len); namelen += (1 + temp->d_name.len);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册